Merge lp:~hikiko/unity/unity.tmp-fix-for-1602901 into lp:unity

Proposed by Eleni Maria Stea on 2016-07-15
Status: Merged
Approved by: Andrea Azzarone on 2016-07-15
Approved revision: 4152
Merged at revision: 4152
Proposed branch: lp:~hikiko/unity/unity.tmp-fix-for-1602901
Merge into: lp:unity
Diff against target: 80 lines (+11/-11)
2 files modified
plugins/unityshell/src/unityshell.cpp (+10/-10)
plugins/unityshell/src/unityshell.h (+1/-1)
To merge this branch: bzr merge lp:~hikiko/unity/unity.tmp-fix-for-1602901
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) 2016-07-15 Approve on 2016-07-15
Review via email: mp+300174@code.launchpad.net

Commit message

Reverts fix for multimonitor because of problems in nvidia cards (see bug: #1602901)

Description of the change

Reverts fix for multimonitor because of problems in nvidia cards (see bug: #1602901)

To post a comment you must log in.
Andrea Azzarone (azzar1) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/unityshell.cpp'
2--- plugins/unityshell/src/unityshell.cpp 2016-07-05 10:23:04 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2016-07-15 10:29:46 +0000
4@@ -863,7 +863,7 @@
5 cScreen->damageRegion(CompRegionFromNuxGeo(blur_update));
6 }
7
8-void UnityScreen::paintOutput()
9+void UnityScreen::paintDisplay()
10 {
11 CompOutput *output = last_output_;
12
13@@ -884,7 +884,7 @@
14 current_draw_binding = old_read_binding;
15 #endif
16
17- BackgroundEffectHelper::monitor_rect_.Set(0, 0, output->width(), output->height());
18+ BackgroundEffectHelper::monitor_rect_.Set(0, 0, screen->width(), screen->height());
19
20 // If we have dirty helpers re-copy the backbuffer into a texture
21 if (dirty_helpers_on_this_frame_)
22@@ -909,10 +909,10 @@
23
24 for (CompRect const& rect : blur_region.rects())
25 {
26- int x = nux::Clamp<int>(rect.x(), 0, output->width());
27- int y = nux::Clamp<int>(output->height() - rect.y2(), 0, output->height());
28- int width = std::min<int>(output->width() - rect.x(), rect.width());
29- int height = std::min<int>(output->height() - y, rect.height());
30+ int x = nux::Clamp<int>(rect.x(), 0, screen->width());
31+ int y = nux::Clamp<int>(screen->height() - rect.y2(), 0, screen->height());
32+ int width = std::min<int>(screen->width() - rect.x(), rect.width());
33+ int height = std::min<int>(screen->height() - y, rect.height());
34
35 CHECKGL(glCopyTexSubImage2D(surface_target, 0, x, y, x, y, width, height));
36 }
37@@ -1504,7 +1504,7 @@
38 doShellRepaint = false;
39
40 if (doShellRepaint)
41- paintOutput();
42+ paintDisplay();
43
44 return ret;
45 }
46@@ -3094,18 +3094,18 @@
47
48 if (uScreen->doShellRepaint && window == uScreen->onboard_)
49 {
50- uScreen->paintOutput();
51+ uScreen->paintDisplay();
52 }
53 else if (uScreen->doShellRepaint &&
54 window == uScreen->firstWindowAboveShell &&
55 !uScreen->forcePaintOnTop() &&
56 !uScreen->fullscreenRegion.contains(window->geometry()))
57 {
58- uScreen->paintOutput();
59+ uScreen->paintDisplay();
60 }
61 else if (locked && CanBypassLockScreen())
62 {
63- uScreen->paintOutput();
64+ uScreen->paintDisplay();
65 }
66
67 enum class DrawPanelShadow
68
69=== modified file 'plugins/unityshell/src/unityshell.h'
70--- plugins/unityshell/src/unityshell.h 2016-07-02 16:57:09 +0000
71+++ plugins/unityshell/src/unityshell.h 2016-07-15 10:29:46 +0000
72@@ -179,7 +179,7 @@
73 void nuxEpilogue();
74
75 /* nux draw wrapper */
76- void paintOutput();
77+ void paintDisplay();
78 void paintPanelShadow(CompRegion const& clip);
79 void setPanelShadowMatrix(const GLMatrix& matrix);
80 void updateBlurDamage();