From 8ae7e4c958a0b59a0b555b9c60a227521f5da327 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sun, 24 Sep 2017 13:05:52 +0200
Subject: [PATCH] Make Enter on a name edit accept the dialog

---
 apps/openmw/mwgui/alchemywindow.cpp       | 9 +++++++++
 apps/openmw/mwgui/alchemywindow.hpp       | 1 +
 apps/openmw/mwgui/enchantingdialog.cpp    | 8 ++++++++
 apps/openmw/mwgui/enchantingdialog.hpp    | 3 ++-
 apps/openmw/mwgui/spellcreationdialog.cpp | 6 ++++++
 apps/openmw/mwgui/spellcreationdialog.hpp | 1 +
 6 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp
index 5b1489821..0140653a1 100644
--- a/apps/openmw/mwgui/alchemywindow.cpp
+++ b/apps/openmw/mwgui/alchemywindow.cpp
@@ -54,9 +54,16 @@ namespace MWGui
         mCreateButton->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onCreateButtonClicked);
         mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onCancelButtonClicked);
 
+        mNameEdit->eventEditSelectAccept += MyGUI::newDelegate(this, &AlchemyWindow::onAccept);
+
         center();
     }
 
+    void AlchemyWindow::onAccept(MyGUI::EditBox* sender)
+    {
+        onCreateButtonClicked(sender);
+    }
+
     void AlchemyWindow::onCancelButtonClicked(MyGUI::Widget* _sender)
     {
         MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Alchemy);
@@ -128,6 +135,8 @@ namespace MWGui
         }
 
         update();
+
+        MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mNameEdit);
     }
 
     void AlchemyWindow::onIngredientSelected(MyGUI::Widget* _sender)
diff --git a/apps/openmw/mwgui/alchemywindow.hpp b/apps/openmw/mwgui/alchemywindow.hpp
index a27d9c749..2d13a346a 100644
--- a/apps/openmw/mwgui/alchemywindow.hpp
+++ b/apps/openmw/mwgui/alchemywindow.hpp
@@ -44,6 +44,7 @@ namespace MWGui
         void onCancelButtonClicked(MyGUI::Widget* _sender);
         void onCreateButtonClicked(MyGUI::Widget* _sender);
         void onIngredientSelected(MyGUI::Widget* _sender);
+        void onAccept(MyGUI::EditBox*);
 
         void onSelectedItem(int index);
 
diff --git a/apps/openmw/mwgui/enchantingdialog.cpp b/apps/openmw/mwgui/enchantingdialog.cpp
index 88973bd46..74d80d292 100644
--- a/apps/openmw/mwgui/enchantingdialog.cpp
+++ b/apps/openmw/mwgui/enchantingdialog.cpp
@@ -4,6 +4,7 @@
 
 #include <MyGUI_Button.h>
 #include <MyGUI_ScrollView.h>
+#include <MyGUI_EditBox.h>
 
 #include <components/widgets/list.hpp>
 #include <components/settings/settings.hpp>
@@ -53,6 +54,7 @@ namespace MWGui
         mSoulBox->eventMouseButtonClick += MyGUI::newDelegate(this, &EnchantingDialog::onSelectSoul);
         mBuyButton->eventMouseButtonClick += MyGUI::newDelegate(this, &EnchantingDialog::onBuyButtonClicked);
         mTypeButton->eventMouseButtonClick += MyGUI::newDelegate(this, &EnchantingDialog::onTypeButtonClicked);
+        mName->eventEditSelectAccept += MyGUI::newDelegate(this, &EnchantingDialog::onAccept);
     }
 
     EnchantingDialog::~EnchantingDialog()
@@ -63,6 +65,7 @@ namespace MWGui
     void EnchantingDialog::onOpen()
     {
         center();
+        MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mName);
     }
 
     void EnchantingDialog::setSoulGem(const MWWorld::Ptr &gem)
@@ -284,6 +287,11 @@ namespace MWGui
         updateEffectsView();
     }
 
+    void EnchantingDialog::onAccept(MyGUI::EditBox *sender)
+    {
+        onBuyButtonClicked(sender);
+    }
+
     void EnchantingDialog::onBuyButtonClicked(MyGUI::Widget* sender)
     {
         if (mEffects.size() <= 0)
diff --git a/apps/openmw/mwgui/enchantingdialog.hpp b/apps/openmw/mwgui/enchantingdialog.hpp
index 39614ebd1..4906de919 100644
--- a/apps/openmw/mwgui/enchantingdialog.hpp
+++ b/apps/openmw/mwgui/enchantingdialog.hpp
@@ -48,6 +48,7 @@ namespace MWGui
         void onBuyButtonClicked(MyGUI::Widget* sender);
         void updateLabels();
         void onTypeButtonClicked(MyGUI::Widget* sender);
+        void onAccept(MyGUI::EditBox* sender);
 
         ItemSelectionDialog* mItemSelectionDialog;
 
@@ -60,7 +61,7 @@ namespace MWGui
         MyGUI::Button* mTypeButton;
         MyGUI::Button* mBuyButton;
 
-        MyGUI::TextBox* mName;
+        MyGUI::EditBox* mName;
         MyGUI::TextBox* mEnchantmentPoints;
         MyGUI::TextBox* mCastCost;
         MyGUI::TextBox* mCharge;
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index d5dee1139..4aa208d8f 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -349,6 +349,7 @@ namespace MWGui
 
         mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellCreationDialog::onCancelButtonClicked);
         mBuyButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellCreationDialog::onBuyButtonClicked);
+        mNameEdit->eventEditSelectAccept += MyGUI::newDelegate(this, &SpellCreationDialog::onAccept);
 
         setWidgets(mAvailableEffectsList, mUsedEffectsView);
     }
@@ -416,6 +417,11 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_SpellCreation);
     }
 
+    void SpellCreationDialog::onAccept(MyGUI::EditBox *sender)
+    {
+        onBuyButtonClicked(sender);
+    }
+
     void SpellCreationDialog::onOpen()
     {
         center();
diff --git a/apps/openmw/mwgui/spellcreationdialog.hpp b/apps/openmw/mwgui/spellcreationdialog.hpp
index 855016666..ec90fa3ce 100644
--- a/apps/openmw/mwgui/spellcreationdialog.hpp
+++ b/apps/openmw/mwgui/spellcreationdialog.hpp
@@ -162,6 +162,7 @@ namespace MWGui
 
         void onCancelButtonClicked (MyGUI::Widget* sender);
         void onBuyButtonClicked (MyGUI::Widget* sender);
+        void onAccept(MyGUI::EditBox* sender);
 
         virtual void notifyEffectsChanged ();