From be19f51013ece60db26a860388778c1b5b6f103c Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sat, 23 Sep 2017 12:55:28 +0200
Subject: [PATCH] Adjust some more windows to be keyboard friendlier

---
 apps/openmw/mwgui/birth.cpp                | 1 +
 apps/openmw/mwgui/class.cpp                | 1 +
 apps/openmw/mwgui/dialogue.cpp             | 3 +++
 apps/openmw/mwgui/race.cpp                 | 2 ++
 apps/openmw/mwgui/spellcreationdialog.cpp  | 1 +
 apps/openmw/mwgui/spellview.cpp            | 1 +
 files/mygui/openmw_inventory_window.layout | 5 +++++
 files/mygui/openmw_trade_window.layout     | 5 +++++
 8 files changed, 19 insertions(+)

diff --git a/apps/openmw/mwgui/birth.cpp b/apps/openmw/mwgui/birth.cpp
index b4a6b7d2f..92f29e3ef 100644
--- a/apps/openmw/mwgui/birth.cpp
+++ b/apps/openmw/mwgui/birth.cpp
@@ -69,6 +69,7 @@ namespace MWGui
         WindowModal::onOpen();
         updateBirths();
         updateSpells();
+        MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mBirthList);
     }
 
 
diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index c63d470d7..33daa0ad1 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -130,6 +130,7 @@ namespace MWGui
         WindowModal::onOpen ();
         updateClasses();
         updateStats();
+        MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mClassList);
     }
 
 
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 48d291325..2effcc700 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -526,7 +526,10 @@ namespace MWGui
         }
 
         bool goodbyeEnabled = !MWBase::Environment::get().getDialogueManager()->isInChoice() || mGoodbye;
+        bool goodbyeWasEnabled = mGoodbyeButton->getEnabled();
         mGoodbyeButton->setEnabled(goodbyeEnabled);
+        if (goodbyeEnabled && !goodbyeWasEnabled)
+            MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mGoodbyeButton);
 
         bool topicsEnabled = !MWBase::Environment::get().getDialogueManager()->isInChoice() && !mGoodbye;
         mTopicsList->setEnabled(topicsEnabled);
diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index 374a5d3d8..2b407ac93 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -163,6 +163,8 @@ namespace MWGui
         size_t initialPos = mHeadRotate->getScrollRange()/2+mHeadRotate->getScrollRange()/10;
         mHeadRotate->setScrollPosition(initialPos);
         onHeadRotate(mHeadRotate, initialPos);
+
+        MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mRaceList);
     }
 
     void RaceDialog::setRaceId(const std::string &raceId)
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 8d0639d25..d5dee1139 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -419,6 +419,7 @@ namespace MWGui
     void SpellCreationDialog::onOpen()
     {
         center();
+        MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mNameEdit);
     }
 
     void SpellCreationDialog::onReferenceUnavailable ()
diff --git a/apps/openmw/mwgui/spellview.cpp b/apps/openmw/mwgui/spellview.cpp
index ebda8873c..4268b33a0 100644
--- a/apps/openmw/mwgui/spellview.cpp
+++ b/apps/openmw/mwgui/spellview.cpp
@@ -106,6 +106,7 @@ namespace MWGui
 
             Gui::SharedStateButton* t = mScrollView->createWidget<Gui::SharedStateButton>(skin,
                 MyGUI::IntCoord(0, 0, 0, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top);
+            t->setNeedKeyFocus(true);
             t->setCaption(spell.mName);
             t->setTextAlign(MyGUI::Align::Left);
             adjustSpellWidget(spell, i, t);
diff --git a/files/mygui/openmw_inventory_window.layout b/files/mygui/openmw_inventory_window.layout
index bb707fa0d..6221799b5 100644
--- a/files/mygui/openmw_inventory_window.layout
+++ b/files/mygui/openmw_inventory_window.layout
@@ -32,18 +32,23 @@
             <Widget type="HBox" position="0 8 350 24" align="Left Top HStretch" name="Categories">
                 <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 60 24" name="AllButton">
                     <Property key="Caption" value="#{sAllTab}"/>
+                    <Property key="NeedKey" value="false"/>
                 </Widget>
                 <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 60 24" name="WeaponButton">
                     <Property key="Caption" value="#{sWeaponTab}"/>
+                    <Property key="NeedKey" value="false"/>
                 </Widget>
                 <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 60 24" name="ApparelButton">
                     <Property key="Caption" value="#{sApparelTab}"/>
+                    <Property key="NeedKey" value="false"/>
                 </Widget>
                 <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 60 24" name="MagicButton">
                     <Property key="Caption" value="#{sMagicTab}"/>
+                    <Property key="NeedKey" value="false"/>
                 </Widget>
                 <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 60 24" name="MiscButton">
                     <Property key="Caption" value="#{sMiscTab}"/>
+                    <Property key="NeedKey" value="false"/>
                 </Widget>
             </Widget>
 
diff --git a/files/mygui/openmw_trade_window.layout b/files/mygui/openmw_trade_window.layout
index f9f24581f..d1f31c475 100644
--- a/files/mygui/openmw_trade_window.layout
+++ b/files/mygui/openmw_trade_window.layout
@@ -9,18 +9,23 @@
         <Widget type="HBox" position="8 8 566 24" align="Left Top HStretch" name="Categories">
             <Widget type="AutoSizedButton" skin="MW_Button" name="AllButton">
                 <Property key="Caption" value="#{sAllTab}"/>
+                <Property key="NeedKey" value="false"/>
             </Widget>
             <Widget type="AutoSizedButton" skin="MW_Button" name="WeaponButton">
                 <Property key="Caption" value="#{sWeaponTab}"/>
+                <Property key="NeedKey" value="false"/>
             </Widget>
             <Widget type="AutoSizedButton" skin="MW_Button" name="ApparelButton">
                 <Property key="Caption" value="#{sApparelTab}"/>
+                <Property key="NeedKey" value="false"/>
             </Widget>
             <Widget type="AutoSizedButton" skin="MW_Button" name="MagicButton">
                 <Property key="Caption" value="#{sMagicTab}"/>
+                <Property key="NeedKey" value="false"/>
             </Widget>
             <Widget type="AutoSizedButton" skin="MW_Button" name="MiscButton">
                 <Property key="Caption" value="#{sMiscTab}"/>
+                <Property key="NeedKey" value="false"/>
             </Widget>
         </Widget>