summaryrefslogtreecommitdiff
path: root/plugins
diff options
authorAndrea Azzarone <azzaronea@gmail.com>2016-06-30 13:51:07 +0200
committerAndrea Azzarone <azzaronea@gmail.com>2016-06-30 13:51:07 +0200
commite0a71c1a0902fe036de229b88a419c74a34dae2f (patch)
tree05ca72577a42744b4eb165deb323900852df90d3 /plugins
parent6d863f651580e911d0c59d83bbb00c4253a5b446 (diff)
Filter out fullscreen window in show desktop mode.
Fixes LP: #1597706 (bzr r4132.1.2)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/unityshell/src/unityshell.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 9aa9cdad0..848981202 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -2986,7 +2986,7 @@ bool UnityWindow::glPaint(const GLWindowPaintAttrib& attrib,
uScreen->windows_for_monitor_[monitor] = 1;
if (!(mask & nonOcclusionBits) &&
- (window->state() & CompWindowStateFullscreenMask && !window->minimized()) &&
+ (window->state() & CompWindowStateFullscreenMask && !window->minimized() && !window->inShowDesktopMode()) &&
uScreen->windows_for_monitor_[monitor] == 1)
// And I've been advised to test other things, but they don't work:
// && (attrib.opacity == OPAQUE)) <-- Doesn't work; Only set in glDraw