From 842a42ee664b30dee6e9bd74c4a70de1bfca19ea Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Thu, 5 Oct 2017 18:39:58 +0200
Subject: [PATCH] Fix non-top level Windows accepting key focus

---
 apps/openmw/mwgui/keyboardnavigation.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwgui/keyboardnavigation.cpp b/apps/openmw/mwgui/keyboardnavigation.cpp
index 2b06de295..d27185204 100644
--- a/apps/openmw/mwgui/keyboardnavigation.cpp
+++ b/apps/openmw/mwgui/keyboardnavigation.cpp
@@ -12,6 +12,11 @@
 namespace MWGui
 {
 
+bool shouldAcceptKeyFocus(MyGUI::Widget* w)
+{
+    return w && !w->castType<MyGUI::Window>(false) && w->getInheritedEnabled() && w->getInheritedVisible() && w->getVisible() && w->getEnabled();
+}
+
 /// Recursively get all child widgets that accept keyboard input
 void getKeyFocusWidgets(MyGUI::Widget* parent, std::vector<MyGUI::Widget*>& results)
 {
@@ -24,18 +29,13 @@ void getKeyFocusWidgets(MyGUI::Widget* parent, std::vector<MyGUI::Widget*>& resu
         MyGUI::Widget* w = enumerator.current();
         if (!w->getVisible() || !w->getEnabled())
             continue;
-        if (w->getNeedKeyFocus())
+        if (w->getNeedKeyFocus() && shouldAcceptKeyFocus(w))
             results.push_back(w);
         else
             getKeyFocusWidgets(w, results);
     }
 }
 
-bool shouldAcceptKeyFocus(MyGUI::Widget* w)
-{
-    return w && !w->castType<MyGUI::Window>(false) && w->getInheritedEnabled() && w->getInheritedVisible() && w->getVisible() && w->getEnabled();
-}
-
 KeyboardNavigation::KeyboardNavigation()
     : mCurrentFocus(nullptr)
     , mModalWindow(nullptr)