Merge lp:~azzar1/unity/fix-lp-1597706 into lp:unity

Proposed by Andrea Azzarone on 2016-06-30
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2016-06-30
Approved revision: 4134
Merged at revision: 4137
Proposed branch: lp:~azzar1/unity/fix-lp-1597706
Merge into: lp:unity
Prerequisite: lp:~azzar1/unity/add-missing-header
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/unityshell/src/unityshell.cpp (+1/-1)
To merge this branch: bzr merge lp:~azzar1/unity/fix-lp-1597706
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2016-06-30 Approve on 2016-06-30
Review via email: mp+298764@code.launchpad.net

Commit message

Filter out fullscreen window in show desktop mode to decide if unity must be displayed.

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) wrote :

Buona!

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-06-21 01:28:26 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2016-06-30 11:55:37 +0000
4@@ -2986,7 +2986,7 @@
5 uScreen->windows_for_monitor_[monitor] = 1;
6
7 if (!(mask & nonOcclusionBits) &&
8- (window->state() & CompWindowStateFullscreenMask && !window->minimized()) &&
9+ (window->state() & CompWindowStateFullscreenMask && !window->minimized() && !window->inShowDesktopMode()) &&
10 uScreen->windows_for_monitor_[monitor] == 1)
11 // And I've been advised to test other things, but they don't work:
12 // && (attrib.opacity == OPAQUE)) <-- Doesn't work; Only set in glDraw