summaryrefslogtreecommitdiff
path: root/unity-shared
diff options
authorMarco Trevisan (TreviƱo) <mail@3v1n0.net>2014-11-28 12:55:36 +0000
committerCI bot <ps-jenkins@lists.canonical.com>2014-11-28 12:55:36 +0000
commit850afb9889f925fc65fb8f03cffe035b0d8e87f6 (patch)
treed13fbd78ff3c9d05ba0ed8a41d3ad6d5cf0b1716 /unity-shared
parentb6ac2a4672a8c12026978934729495d3dadf96d4 (diff)
parent41cbf80f3c77d2985c9d7611716625e6c9f5f479 (diff)
PanelMenuView: ensure that proper window tiles and buttons are shown at the right place Fixes: #1384910, #1384958, #1385285
Approved by: Christopher Townsend, PS Jenkins bot (bzr r3889)
Diffstat (limited to 'unity-shared')
-rw-r--r--unity-shared/PluginAdapter.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/unity-shared/PluginAdapter.cpp b/unity-shared/PluginAdapter.cpp
index 1fddfe74b..10573db86 100644
--- a/unity-shared/PluginAdapter.cpp
+++ b/unity-shared/PluginAdapter.cpp
@@ -554,9 +554,10 @@ bool PluginAdapter::IsWindowOnCurrentDesktop(Window window_id) const
bool PluginAdapter::IsWindowObscured(Window window_id) const
{
- CompWindow* window = m_Screen->findWindow(window_id);
+ if (_spread_state)
+ return false;
- if (window)
+ if (CompWindow* window = m_Screen->findWindow(window_id))
{
if (window->inShowDesktopMode())
return true;