summaryrefslogtreecommitdiff
path: root/unity-shared
diff options
authorBrandon Schaefer <brandon.schaefer@canonical.com>2013-01-09 10:47:08 -0800
committerBrandon Schaefer <brandon.schaefer@canonical.com>2013-01-09 10:47:08 -0800
commitbdedd1f46262e7ec30dbbedaea1e4d51995bd9bb (patch)
tree3c5a8a15d923b03feaabc93da25477cc498dd3e2 /unity-shared
parent8aff20b8b0c61d4bb7811cf25815f9751b5d45cb (diff)
* If the dash is the current active window then check the window stack for the hud icon.
(bzr r3024.1.1)
Diffstat (limited to 'unity-shared')
-rw-r--r--unity-shared/BamfApplicationManager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/unity-shared/BamfApplicationManager.cpp b/unity-shared/BamfApplicationManager.cpp
index 5a2140327..5feda5c9b 100644
--- a/unity-shared/BamfApplicationManager.cpp
+++ b/unity-shared/BamfApplicationManager.cpp
@@ -546,8 +546,8 @@ ApplicationWindowPtr Manager::GetActiveWindow()
active_win = nullptr;
// If the active window is a dock type, then we want the first visible, non-dock type.
- if (active_win &&
- bamf_window_get_window_type(active_win) == BAMF_WINDOW_DOCK)
+ if ((active_win && bamf_window_get_window_type(active_win) == BAMF_WINDOW_DOCK) ||
+ std::find(our_xids.begin(), our_xids.end(), xid) != our_xids.end())
{
LOG_DEBUG(logger) << "Is a dock, looking at the window stack.";
std::shared_ptr<GList> windows(bamf_matcher_get_window_stack_for_monitor(matcher_, -1), g_list_free);