Merge lp:~3v1n0/unity/panel-shadow-fullscreen-fix into lp:unity

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3313
Proposed branch: lp:~3v1n0/unity/panel-shadow-fullscreen-fix
Merge into: lp:unity
Diff against target: 22 lines (+3/-3)
1 file modified
plugins/unityshell/src/unityshell.cpp (+3/-3)
To merge this branch: bzr merge lp:~3v1n0/unity/panel-shadow-fullscreen-fix
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Andrea Azzarone (community) Approve
Review via email: mp+160441@code.launchpad.net

Commit message

UnityWindow: don't draw the panel shadow above a fullscreen window.

Description of the change

Full screen windows occupy the entire output geometry, so we don't ever need to draw the panel shadow above it.

Proposed for trunk as it doesn't interfere with the 100 scopes branch.

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

Works here.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

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 2013-04-16 22:11:24 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2013-04-23 17:13:36 +0000
4@@ -2302,8 +2302,6 @@
5
6 if (p)
7 {
8- MultiActionList expoActions;
9-
10 for (CompOption& option : p->vTable->getOptions())
11 {
12 if (option.name() == "close_window_key")
13@@ -2624,7 +2622,9 @@
14 {
15 draw_panel_shadow = DrawPanelShadow::BELOW_WINDOW;
16
17- if (!(window->state() & MAXIMIZE_STATE))
18+ if (!(window->state() & CompWindowStateMaximizedVertMask) &&
19+ !(window->state() & CompWindowStateFullscreenMask) &&
20+ !(window->type() & CompWindowTypeFullscreenMask))
21 {
22 auto const& output = uScreen->screen->currentOutputDev();
23