From 73e9d7f3156c52fade63654379d8c41ed44dd8c0 Mon Sep 17 00:00:00 2001
From: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date: Sat, 13 Nov 2021 13:48:12 +0000
Subject: [PATCH] Recompute minimum settings window size based on tab bar size

---
 apps/openmw/mwgui/settingswindow.cpp | 28 ++++++++++++++++++++++++++++
 apps/openmw/mwgui/settingswindow.hpp |  2 ++
 2 files changed, 30 insertions(+)

diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 257c129e8c..4951d69844 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -267,6 +267,8 @@ namespace MWGui
         mKeyboardSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onKeyboardSwitchClicked);
         mControllerSwitch->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onControllerSwitchClicked);
 
+        computeMinimumWindowSize();
+
         center();
 
         mResetControlsButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onResetDefaultBindings);
@@ -739,6 +741,32 @@ namespace MWGui
         layoutControlsBox();
     }
 
+    void SettingsWindow::computeMinimumWindowSize()
+    {
+        auto* window = mMainWidget->castType<MyGUI::Window>();
+        auto minSize = window->getMinSize();
+
+        // Window should be at minimum wide enough to show all tabs.
+        int tabBarWidth = 0;
+        for (uint32_t i = 0; i < mSettingsTab->getItemCount(); i++)
+        {
+            tabBarWidth += mSettingsTab->getButtonWidthAt(i);
+        }
+
+        // Need to include window margins
+        int margins = mMainWidget->getWidth() - mSettingsTab->getWidth();
+        int minimumWindowWidth = tabBarWidth + margins;
+
+        if (minimumWindowWidth > minSize.width)
+        {
+            minSize.width = minimumWindowWidth;
+            window->setMinSize(minSize);
+
+            // Make a dummy call to setSize so MyGUI can apply any resize resulting from the change in MinSize
+            mMainWidget->setSize(mMainWidget->getSize());
+        }
+    }
+
     void SettingsWindow::resetScrollbars()
     {
         mResolutionList->setScrollPosition(0);
diff --git a/apps/openmw/mwgui/settingswindow.hpp b/apps/openmw/mwgui/settingswindow.hpp
index 9c28733f9a..5b04da553b 100644
--- a/apps/openmw/mwgui/settingswindow.hpp
+++ b/apps/openmw/mwgui/settingswindow.hpp
@@ -75,6 +75,8 @@ namespace MWGui
             void updateSliderLabel(MyGUI::ScrollBar* scroller, const std::string& value);
 
             void layoutControlsBox();
+
+            void computeMinimumWindowSize();
         
         private:
             void resetScrollbars();