Allow to set default focus for interactive messagebox

apps/openmw/mwbase/windowmanager.hpp

@@ -254,8 +254,8 @@ namespace MWBase
             = 0;
         virtual void staticMessageBox(std::string_view message) = 0;
         virtual void removeStaticMessageBox() = 0;
-        virtual void interactiveMessageBox(
+        virtual void interactiveMessageBox(std::string_view message, const std::vector<std::string>& buttons = {},
-            std::string_view message, const std::vector<std::string>& buttons = {}, bool block = false)
+            bool block = false, int defaultFocus = -1)
             = 0;
 
         /// returns the index of the pressed button or -1 if no button was pressed

apps/openmw/mwgui/messagebox.cpp

@@ -126,7 +126,7 @@ namespace MWGui
     }
 
     bool MessageBoxManager::createInteractiveMessageBox(
-        std::string_view message, const std::vector<std::string>& buttons, bool immediate)
+        std::string_view message, const std::vector<std::string>& buttons, bool immediate, int defaultFocus)
     {
         if (mInterMessageBoxe != nullptr)
         {
@@ -134,7 +134,8 @@ namespace MWGui
             mInterMessageBoxe->setVisible(false);
         }
 
-        mInterMessageBoxe = std::make_unique<InteractiveMessageBox>(*this, std::string{ message }, buttons, immediate);
+        mInterMessageBoxe
+            = std::make_unique<InteractiveMessageBox>(*this, std::string{ message }, buttons, immediate, defaultFocus);
         mLastButtonPressed = -1;
 
         return true;
@@ -215,12 +216,13 @@ namespace MWGui
     }
 
     InteractiveMessageBox::InteractiveMessageBox(MessageBoxManager& parMessageBoxManager, const std::string& message,
-        const std::vector<std::string>& buttons, bool immediate)
+        const std::vector<std::string>& buttons, bool immediate, int defaultFocus)
         : WindowModal(MWBase::Environment::get().getWindowManager()->isGuiMode()
                 ? "openmw_interactive_messagebox_notransp.layout"
                 : "openmw_interactive_messagebox.layout")
         , mMessageBoxManager(parMessageBoxManager)
         , mButtonPressed(-1)
+        , mDefaultFocus(defaultFocus)
         , mImmediate(immediate)
     {
         int textPadding = 10; // padding between text-widget and main-widget
@@ -378,6 +380,9 @@ namespace MWGui
     MyGUI::Widget* InteractiveMessageBox::getDefaultKeyFocus()
     {
         std::vector<std::string> keywords{ "sOk", "sYes" };
+        if (mDefaultFocus >= 0 && mDefaultFocus < static_cast<int>(mButtons.size()))
+            return mButtons[mDefaultFocus];
+
         for (MyGUI::Button* button : mButtons)
         {
             for (const std::string& keyword : keywords)

apps/openmw/mwgui/messagebox.hpp

@@ -25,8 +25,8 @@ namespace MWGui
         void onFrame(float frameDuration);
         void createMessageBox(std::string_view message, bool stat = false);
         void removeStaticMessageBox();
-        bool createInteractiveMessageBox(
+        bool createInteractiveMessageBox(std::string_view message, const std::vector<std::string>& buttons,
-            std::string_view message, const std::vector<std::string>& buttons, bool immediate = false);
+            bool immediate = false, int defaultFocus = -1);
         bool isInteractiveMessageBox();
 
         int getMessagesCount();
@@ -93,7 +93,7 @@ namespace MWGui
     {
     public:
         InteractiveMessageBox(MessageBoxManager& parMessageBoxManager, const std::string& message,
-            const std::vector<std::string>& buttons, bool immediate);
+            const std::vector<std::string>& buttons, bool immediate, int defaultFocus);
         void mousePressed(MyGUI::Widget* _widget);
         int readPressedButton();
 
@@ -112,6 +112,7 @@ namespace MWGui
         std::vector<MyGUI::Button*> mButtons;
 
         int mButtonPressed;
+        int mDefaultFocus;
         bool mImmediate;
     };
 

apps/openmw/mwgui/windowmanagerimp.cpp

@@ -744,9 +744,9 @@ namespace MWGui
     }
 
     void WindowManager::interactiveMessageBox(
-        std::string_view message, const std::vector<std::string>& buttons, bool block)
+        std::string_view message, const std::vector<std::string>& buttons, bool block, int defaultFocus)
     {
-        mMessageBoxManager->createInteractiveMessageBox(message, buttons, block);
+        mMessageBoxManager->createInteractiveMessageBox(message, buttons, block, defaultFocus);
         updateVisible();
 
         if (block)

apps/openmw/mwgui/windowmanagerimp.hpp

@@ -268,8 +268,8 @@ namespace MWGui
             enum MWGui::ShowInDialogueMode showInDialogueMode = MWGui::ShowInDialogueMode_IfPossible) override;
         void staticMessageBox(std::string_view message) override;
         void removeStaticMessageBox() override;
-        void interactiveMessageBox(
+        void interactiveMessageBox(std::string_view message, const std::vector<std::string>& buttons = {},
-            std::string_view message, const std::vector<std::string>& buttons = {}, bool block = false) override;
+            bool block = false, int defaultFocus = -1) override;
 
         int readPressedButton() override; ///< returns the index of the pressed button or -1 if no button was pressed
                                           ///< (->MessageBoxmanager->InteractiveMessageBox)

apps/openmw/mwstate/statemanagerimp.cpp

@@ -714,11 +714,12 @@ bool MWState::StateManager::confirmLoading(const std::vector<std::string_view>&
     message
         += l10n->formatMessage("MissingContentFilesListCopy", { "files" }, { static_cast<int>(missingFiles.size()) });
 
+    int selectedButton = -1;
     while (true)
     {
         auto windowManager = MWBase::Environment::get().getWindowManager();
-        windowManager->interactiveMessageBox(message, buttons, true);
+        windowManager->interactiveMessageBox(message, buttons, true, selectedButton);
-        int selectedButton = windowManager->readPressedButton();
+        selectedButton = windowManager->readPressedButton();
         if (selectedButton == 0)
             break;