Persist window pinned state

Return-To-The-Roots · Jul 27, 2023 · c1faa91 · c1faa91
1 parent 4866603
commit c1faa91
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/libs/s25main/Settings.cpp b/libs/s25main/Settings.cpp
@@ -355,6 +355,7 @@ void Settings::LoadIngame()
             settings.restorePos = DrawPoint(iniWindow->getValue("restore_pos_x", lastPos.x),
                                             iniWindow->getValue("restore_pos_y", lastPos.y));
             settings.isOpen = iniWindow->getIntValue("is_open");
+            settings.isPinned = iniWindow->getValue("is_pinned", false);
             settings.isMinimized = iniWindow->getValue("is_minimized", false);
         }
     } catch(std::runtime_error& e)
@@ -516,6 +517,7 @@ void Settings::SaveIngame()
             iniWindow->setValue("restore_pos_y", settings.restorePos.y);
         }
         iniWindow->setValue("is_open", settings.isOpen);
+        iniWindow->setValue("is_pinned", settings.isPinned);
         iniWindow->setValue("is_minimized", settings.isMinimized);
     }
 

diff --git a/libs/s25main/Settings.h b/libs/s25main/Settings.h
@@ -27,6 +27,7 @@ struct PersistentWindowSettings
     DrawPoint lastPos = DrawPoint::Invalid();
     DrawPoint restorePos = DrawPoint::Invalid();
     bool isOpen = false;
+    bool isPinned = false;
     bool isMinimized = false;
 };
 

diff --git a/libs/s25main/ingameWindows/IngameWindow.cpp b/libs/s25main/ingameWindows/IngameWindow.cpp
@@ -56,14 +56,14 @@ IngameWindow::IngameWindow(unsigned id, const DrawPoint& pos, const Extent& size
     if(windowSettings_)
     {
         // Restore minimized state
-        if(windowSettings_ && windowSettings_->isMinimized)
+        if(windowSettings_->isMinimized)
         {
             isMinimized_ = true;
             Extent minimizedSize(GetSize().x, contentOffset.y + contentOffsetEnd.y);
             Window::Resize(minimizedSize);
         }
-        // Load restorePos
-        restorePos_ = windowSettings_->restorePos;
+        isPinned_ = windowSettings_->isPinned;     // Restore pinned state
+        restorePos_ = windowSettings_->restorePos; // Load restorePos
     }
 
     // Load last position or center the window
@@ -179,6 +179,15 @@ void IngameWindow::SetMinimized(bool minimized)
         windowSettings_->isMinimized = isMinimized_;
 }
 
+void IngameWindow::SetPinned(bool pinned)
+{
+    isPinned_ = pinned;
+
+    // if possible save the pinned state to settings
+    if(windowSettings_)
+        windowSettings_->isPinned = isPinned_;
+}
+
 void IngameWindow::MouseLeftDown(const MouseCoords& mc)
 {
     // Maus muss sich auf der Titelleiste befinden

diff --git a/libs/s25main/ingameWindows/IngameWindow.h b/libs/s25main/ingameWindows/IngameWindow.h
@@ -87,7 +87,7 @@ class IngameWindow : public Window
     /// ist das Fenster minimiert?
     bool IsMinimized() const { return isMinimized_; }
 
-    void SetPinned(bool pinned = true) { isPinned_ = pinned; }
+    void SetPinned(bool pinned = true);
     bool IsPinned() const { return isPinned_; }
 
     CloseBehavior getCloseBehavior() const { return closeBehavior_; }