{Dash,Hud}Controller: unset the keyfocus area only if one of their children has the focus

Otherwise we could steal the focus to another view (such as the Alt+Tab switcher). Fixes: https://bugs.launchpad.net/bugs/1252760. Approved by PS Jenkins bot, Brandon Schaefer. (bzr r3602)

1 files changed, 6 insertions, 1 deletions

diff --git a/hud/HudController.cpp b/hud/HudController.cpp
index 13c499c6a..6178bb618 100644
--- a/hud/HudController.cpp
+++ b/hud/HudController.cpp
@@ -408,8 +408,13 @@ void Controller::HideHud()
 window_->EnableInputWindow(false, "Hud", true, false);
 visible_ = false;
 
+ auto& wc = nux::GetWindowCompositor();
+ auto *key_focus_area = wc.GetKeyFocusArea();
+ if (key_focus_area && key_focus_area->IsChildOf(view_))
+ wc.SetKeyFocusArea(nullptr, nux::KEY_NAV_NONE);
+
 WindowManager::Default().RestoreInputFocus();
- nux::GetWindowCompositor().SetKeyFocusArea(NULL, nux::KEY_NAV_NONE);
+
 StartShowHideTimeline();
 hud_service_.CloseQuery();