diff options
| author | Chris Townsend <christopher.townsend@canonical.com> | 2015-05-12 13:09:09 +0000 |
|---|---|---|
| committer | CI Train Bot <ci-train-bot@canonical.com> | 2015-05-12 13:09:09 +0000 |
| commit | d9e00c00706360dc4f177639523c57943107a9df (patch) | |
| tree | 5e168dc2de6e7678140e2acf9c28b586b94dbd26 /unity-shared | |
| parent | bc56b02ba33590f59d800dbc920469afbd843fb7 (diff) | |
| parent | c19a76ef680cfea8b7ece67daad56ee4b3e30a8d (diff) | |
When looking for the top-most valid window in a VP, also check if the window is focused if the window is set to Always on Top. This allows Launcher icon spread to work properly when a window is minimized an Always on Top exists in the group.
Fixes: #1131385 Approved by: Marco Trevisan (Treviño), PS Jenkins bot (bzr r3955)
Diffstat (limited to 'unity-shared')
| -rw-r--r-- | unity-shared/PluginAdapter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unity-shared/PluginAdapter.cpp b/unity-shared/PluginAdapter.cpp index 4470fcddf..189f9480c 100644 --- a/unity-shared/PluginAdapter.cpp +++ b/unity-shared/PluginAdapter.cpp @@ -636,7 +636,7 @@ Window PluginAdapter::GetTopMostValidWindowInViewport() const if (window->defaultViewport() == screen_vp && window->isViewable() && window->isMapped() && !window->minimized() && !window->inShowDesktopMode() && - !(window->state() & CompWindowStateAboveMask) && + !((window->state() & CompWindowStateAboveMask) && !window->focused()) && !(window->type() & CompWindowTypeSplashMask) && !(window->type() & CompWindowTypeDockMask) && !window->overrideRedirect() && |