Persist window minimized state

Author: falbrechtskirchinger

libs/s25main/Settings.cpp

@@ -350,6 +350,7 @@ void Settings::LoadIngame()
             windows.persistentSettings[window.first].lastPos.x = iniWindow->getIntValue("pos_x");
             windows.persistentSettings[window.first].lastPos.y = iniWindow->getIntValue("pos_y");
             windows.persistentSettings[window.first].isOpen = iniWindow->getIntValue("is_open");
+            windows.persistentSettings[window.first].isMinimized = iniWindow->getValue("is_minimized", false);
         }
     } catch(std::runtime_error& e)
     {
@@ -502,6 +503,7 @@ void Settings::SaveIngame()
         iniWindow->setValue("pos_x", windows.persistentSettings[window.first].lastPos.x);
         iniWindow->setValue("pos_y", windows.persistentSettings[window.first].lastPos.y);
         iniWindow->setValue("is_open", windows.persistentSettings[window.first].isOpen);
+        iniWindow->setValue("is_minimized", windows.persistentSettings[window.first].isMinimized);
     }
 
     bfs::path settingsPathIngame = RTTRCONFIG.ExpandPath(s25::resources::ingameOptions);

libs/s25main/Settings.h

@@ -26,6 +26,7 @@ struct PersistentWindowSettings
 {
     DrawPoint lastPos = DrawPoint::Invalid();
     bool isOpen = false;
+    bool isMinimized = false;
 };
 
 /// Configuration class

libs/s25main/ingameWindows/IngameWindow.cpp

@@ -50,11 +50,18 @@ IngameWindow::IngameWindow(unsigned id, const DrawPoint& pos, const Extent& size
     // Save to settings that window is open
     SaveOpenStatus(true);
 
-    // Load last position or center the window
+    // Load lastPos before it is overwritten when restoring minimized state
+    const auto lastPos = (windowSettings_ ? windowSettings_->lastPos : DrawPoint::Invalid());
+
+    // Restore minimized state
+    if(windowSettings_ && windowSettings_->isMinimized)
+        SetMinimized();
+
+    // Restore last position or center the window
     if(pos == posLastOrCenter)
     {
-        if(windowSettings_ && windowSettings_->lastPos.isValid())
-            SetPos(windowSettings_->lastPos);
+        if(lastPos.isValid())
+            SetPos(lastPos);
         else
             MoveToCenter();
     } else if(pos == posCenter)
@@ -128,6 +135,10 @@ void IngameWindow::SetMinimized(bool minimized)
         fullSize.y = iwHeight + contentOffset.y + contentOffsetEnd.y;
     this->isMinimized_ = minimized;
     Resize(fullSize);
+
+    // if possible save the minimized state to settings
+    if(windowSettings_)
+        windowSettings_->isMinimized = isMinimized_;
 }
 
 void IngameWindow::MouseLeftDown(const MouseCoords& mc)