From c6c01870ec299c0f99065d474107bf253a39ec78 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sat, 23 Sep 2017 22:07:30 +0200
Subject: [PATCH] Call onResChange for every window

---
 apps/openmw/mwgui/alchemywindow.hpp     |  2 ++
 apps/openmw/mwgui/bookwindow.hpp        |  2 ++
 apps/openmw/mwgui/quickkeysmenu.hpp     |  2 ++
 apps/openmw/mwgui/scrollwindow.hpp      |  2 ++
 apps/openmw/mwgui/settingswindow.hpp    |  2 ++
 apps/openmw/mwgui/spellbuyingwindow.hpp |  2 ++
 apps/openmw/mwgui/windowbase.hpp        |  4 ++++
 apps/openmw/mwgui/windowmanagerimp.cpp  | 12 ++++--------
 8 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwgui/alchemywindow.hpp b/apps/openmw/mwgui/alchemywindow.hpp
index 8dffaaad1..a27d9c749 100644
--- a/apps/openmw/mwgui/alchemywindow.hpp
+++ b/apps/openmw/mwgui/alchemywindow.hpp
@@ -26,6 +26,8 @@ namespace MWGui
 
         virtual void onOpen();
 
+        void onResChange(int, int) { center(); }
+
     private:
         std::string mSuggestedPotionName;
 
diff --git a/apps/openmw/mwgui/bookwindow.hpp b/apps/openmw/mwgui/bookwindow.hpp
index 4f7224ea8..b20498feb 100644
--- a/apps/openmw/mwgui/bookwindow.hpp
+++ b/apps/openmw/mwgui/bookwindow.hpp
@@ -17,6 +17,8 @@ namespace MWGui
             void setPtr(const MWWorld::Ptr& book);
             void setInventoryAllowed(bool allowed);
 
+            void onResChange(int, int) { center(); }
+
         protected:
             void onNextPageButtonClicked (MyGUI::Widget* sender);
             void onPrevPageButtonClicked (MyGUI::Widget* sender);
diff --git a/apps/openmw/mwgui/quickkeysmenu.hpp b/apps/openmw/mwgui/quickkeysmenu.hpp
index c99d482ee..0070aa55b 100644
--- a/apps/openmw/mwgui/quickkeysmenu.hpp
+++ b/apps/openmw/mwgui/quickkeysmenu.hpp
@@ -22,6 +22,8 @@ namespace MWGui
         QuickKeysMenu();
         ~QuickKeysMenu();
 
+        void onResChange(int, int) { center(); }
+
         void onItemButtonClicked(MyGUI::Widget* sender);
         void onMagicButtonClicked(MyGUI::Widget* sender);
         void onUnassignButtonClicked(MyGUI::Widget* sender);
diff --git a/apps/openmw/mwgui/scrollwindow.hpp b/apps/openmw/mwgui/scrollwindow.hpp
index 596db06ad..35016e5dc 100644
--- a/apps/openmw/mwgui/scrollwindow.hpp
+++ b/apps/openmw/mwgui/scrollwindow.hpp
@@ -20,6 +20,8 @@ namespace MWGui
             void setPtr (const MWWorld::Ptr& scroll);
             void setInventoryAllowed(bool allowed);
 
+            void onResChange(int, int) { center(); }
+
         protected:
             void onCloseButtonClicked (MyGUI::Widget* _sender);
             void onTakeButtonClicked (MyGUI::Widget* _sender);
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 4f8607fda..c6e48819c 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -19,6 +19,8 @@ namespace MWGui
 
             void updateControlsBox();
 
+            void onResChange(int, int) { center(); }
+
     protected:
             MyGUI::TabControl* mSettingsTab;
             MyGUI::Button* mOkButton;
diff --git a/apps/openmw/mwgui/spellbuyingwindow.hpp b/apps/openmw/mwgui/spellbuyingwindow.hpp
index 6eb52366b..36f7499a0 100644
--- a/apps/openmw/mwgui/spellbuyingwindow.hpp
+++ b/apps/openmw/mwgui/spellbuyingwindow.hpp
@@ -30,6 +30,8 @@ namespace MWGui
 
             void onFrame(float dt) { checkReferenceAvailable(); }
 
+            void onResChange(int, int) { center(); }
+
         protected:
             MyGUI::Button* mCancelButton;
             MyGUI::TextBox* mPlayerGold;
diff --git a/apps/openmw/mwgui/windowbase.hpp b/apps/openmw/mwgui/windowbase.hpp
index 6889ad9ec..c9f9555b0 100644
--- a/apps/openmw/mwgui/windowbase.hpp
+++ b/apps/openmw/mwgui/windowbase.hpp
@@ -42,7 +42,11 @@ namespace MWGui
         virtual void setVisible(bool visible);
         /// Returns the visibility state of the window
         bool isVisible();
+
         void center();
+
+        /// Called when GUI viewport changes size
+        virtual void onResChange(int width, int height) {}
     };
 
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 9635f804e..3e55060f8 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1128,14 +1128,10 @@ namespace MWGui
             it->first->setSize(size);
         }
 
-        mConsole->onResChange(x, y);
-        mMenu->onResChange(x, y);
-        mSettingsWindow->center();
-        mAlchemyWindow->center();
-        mScrollWindow->center();
-        mBookWindow->center();
-        mQuickKeysMenu->center();
-        mSpellBuyingWindow->center();
+        for (WindowBase* window : mWindows)
+            window->onResChange(x, y);
+
+        // TODO: check if any windows are now off-screen and move them back if so
     }
 
     void WindowManager::onCursorChange(const std::string &name)