Merge lp:~unity-team/unity/unity.panel-shadow-below-active into lp:unity

Proposed by Jason Smith
Status: Merged
Approved by: Jason Smith
Approved revision: no longer in the source branch.
Merged at revision: 1920
Proposed branch: lp:~unity-team/unity/unity.panel-shadow-below-active
Merge into: lp:unity
Diff against target: 24 lines (+8/-1)
1 file modified
plugins/unityshell/src/unityshell.cpp (+8/-1)
To merge this branch: bzr merge lp:~unity-team/unity/unity.panel-shadow-below-active
Reviewer Review Type Date Requested Status
Thomi Richards (community) Approve
Review via email: mp+91914@code.launchpad.net

Description of the change

Makes the panel shadow paint directly below the active window

To post a comment you must log in.
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) wrote :

+1

review: Approve
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) wrote :

+2

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 2012-02-07 19:42:30 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2012-02-07 20:34:19 +0000
4@@ -1982,13 +1982,20 @@
5 }
6 }
7
8+ Window active_window = screen->activeWindow();
9+ if (window->id() == active_window && window->type() != CompWindowTypeDesktopMask)
10+ {
11+ uScreen->paintPanelShadow(matrix);
12+ }
13+
14 bool ret = gWindow->glDraw(matrix, attrib, region, mask);
15
16- if (window->type() == CompWindowTypeDesktopMask)
17+ if (active_window == 0 || active_window == window->id() && window->type() == CompWindowTypeDesktopMask)
18 {
19 uScreen->paintPanelShadow(matrix);
20 }
21
22+
23 return ret;
24 }
25