From 593cfdbdd72ffae58073d67fec50dfda12792e19 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sun, 24 Oct 2021 14:11:19 +0200
Subject: [PATCH] Fixed multiple issues where menu sizes were not properly
 initialized.

---
 es-app/src/guis/GuiMenu.cpp               | 6 ++++++
 es-app/src/guis/GuiScreensaverOptions.cpp | 5 +++++
 es-app/src/guis/GuiScreensaverOptions.h   | 2 ++
 3 files changed, 13 insertions(+)

diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp
index ffa9cd0f2..58bf31976 100644
--- a/es-app/src/guis/GuiMenu.cpp
+++ b/es-app/src/guis/GuiMenu.cpp
@@ -593,6 +593,7 @@ void GuiMenu::openUIOptions()
         }
     });
 
+    s->setSize(mSize);
     mWindow->pushGui(s);
 }
 
@@ -700,6 +701,7 @@ void GuiMenu::openSoundOptions()
         });
     }
 
+    s->setSize(mSize);
     mWindow->pushGui(s);
 }
 
@@ -756,6 +758,7 @@ void GuiMenu::openInputDeviceOptions()
     configure_input_row.makeAcceptInputHandler(std::bind(&GuiMenu::openConfigInput, this, s));
     s->addRow(configure_input_row);
 
+    s->setSize(mSize);
     mWindow->pushGui(s);
 }
 
@@ -1180,12 +1183,14 @@ void GuiMenu::openOtherOptions()
     run_in_background->setCallback(launchWorkaroundToggleFunc);
 #endif
 
+    s->setSize(mSize);
     mWindow->pushGui(s);
 }
 
 void GuiMenu::openUtilitiesMenu()
 {
     auto s = new GuiSettings(mWindow, "UTILITIES");
+    s->setSize(mSize);
     mWindow->pushGui(s);
 }
 
@@ -1263,6 +1268,7 @@ void GuiMenu::openQuitMenu()
         row.addElement(powerOffText, true);
         s->addRow(row);
 
+        s->setSize(mSize);
         mWindow->pushGui(s);
     }
 }
diff --git a/es-app/src/guis/GuiScreensaverOptions.cpp b/es-app/src/guis/GuiScreensaverOptions.cpp
index ea6eaf037..cb5bffae2 100644
--- a/es-app/src/guis/GuiScreensaverOptions.cpp
+++ b/es-app/src/guis/GuiScreensaverOptions.cpp
@@ -17,6 +17,7 @@
 
 GuiScreensaverOptions::GuiScreensaverOptions(Window* window, const std::string& title)
     : GuiSettings(window, title)
+    , mWindow(window)
 {
     // Screensaver timer.
     auto screensaver_timer = std::make_shared<SliderComponent>(mWindow, 0.0f, 30.0f, 1.0f, "m");
@@ -95,6 +96,8 @@ GuiScreensaverOptions::GuiScreensaverOptions(Window* window, const std::string&
     row.makeAcceptInputHandler(
         std::bind(&GuiScreensaverOptions::openVideoScreensaverOptions, this));
     addRow(row);
+
+    setSize(getMenuSize());
 }
 
 void GuiScreensaverOptions::openSlideshowScreensaverOptions()
@@ -206,6 +209,7 @@ void GuiScreensaverOptions::openSlideshowScreensaverOptions()
         }
     });
 
+    s->setSize(mSize);
     mWindow->pushGui(s);
 }
 
@@ -287,5 +291,6 @@ void GuiScreensaverOptions::openVideoScreensaverOptions()
     });
 #endif
 
+    s->setSize(mSize);
     mWindow->pushGui(s);
 }
diff --git a/es-app/src/guis/GuiScreensaverOptions.h b/es-app/src/guis/GuiScreensaverOptions.h
index 9423ab6fe..1fe1993e3 100644
--- a/es-app/src/guis/GuiScreensaverOptions.h
+++ b/es-app/src/guis/GuiScreensaverOptions.h
@@ -18,6 +18,8 @@ public:
     GuiScreensaverOptions(Window* window, const std::string& title);
 
 private:
+    Window* mWindow;
+
     void openSlideshowScreensaverOptions();
     void openVideoScreensaverOptions();
 };