Synchronize HUD visibility settings

Synchronize visibility of game world view HUD elements from parent to child views.
Return-To-The-Roots · Jul 26, 2023 · 25dca9a · 25dca9a
1 parent 48bc284
commit 25dca9a
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 20 deletions.
diff --git a/libs/s25main/ingameWindows/iwObservate.cpp b/libs/s25main/ingameWindows/iwObservate.cpp
@@ -48,6 +48,11 @@ iwObservate::iwObservate(GameWorldView& gwv, const MapPoint selectedPt)
     // Fenster vergroessern/verkleinern
     btPos.x += btSize.x;
     AddImageButton(4, btPos, btSize, TextureColor::Grey, LOADER.GetImageN("io", 109), _("Resize window"));
+
+    // Synchronize visibility of HUD elements with parentView
+    parentView.CopyHudSettingsTo(*view, false);
+    gwvSettingsConnection =
+      parentView.onHudSettingsChanged.connect([this]() { parentView.CopyHudSettingsTo(*view, false); });
 }
 
 void iwObservate::Msg_ButtonClick(const unsigned ctrl_id)

diff --git a/libs/s25main/ingameWindows/iwObservate.h b/libs/s25main/ingameWindows/iwObservate.h
@@ -6,6 +6,7 @@
 
 #include "IngameWindow.h"
 #include "gameTypes/MapCoordinates.h"
+#include <boost/signals2.hpp>
 
 class GameWorldView;
 class MouseCoords;
@@ -30,6 +31,8 @@ class iwObservate : public IngameWindow
     /// id of object currently followed or INVALID_ID
     unsigned followMovableId;
 
+    boost::signals2::scoped_connection gwvSettingsConnection;
+
 public:
     iwObservate(GameWorldView& gwv, MapPoint selectedPt);
 

diff --git a/libs/s25main/world/GameWorldView.cpp b/libs/s25main/world/GameWorldView.cpp
@@ -545,14 +545,42 @@ void GameWorldView::DrawBoundaryStone(const MapPoint& pt, const DrawPoint pos, V
     }
 }
 
-/// Schaltet Produktivitäten/Namen komplett aus oder an
+void GameWorldView::ToggleShowBQ()
+{
+    show_bq = !show_bq;
+    SaveIngameSettingsValues();
+    onHudSettingsChanged();
+}
+
+void GameWorldView::ToggleShowNames()
+{
+    show_names = !show_names;
+    SaveIngameSettingsValues();
+    onHudSettingsChanged();
+}
+
+void GameWorldView::ToggleShowProductivity()
+{
+    show_productivity = !show_productivity;
+    SaveIngameSettingsValues();
+    onHudSettingsChanged();
+}
+
 void GameWorldView::ToggleShowNamesAndProductivity()
 {
     if(show_productivity && show_names)
         show_productivity = show_names = false;
     else
         show_productivity = show_names = true;
     SaveIngameSettingsValues();
+    onHudSettingsChanged();
+}
+
+void GameWorldView::CopyHudSettingsTo(GameWorldView& other, bool copyBQ) const
+{
+    other.show_bq = (copyBQ ? show_bq : false);
+    other.show_names = show_names;
+    other.show_productivity = show_productivity;
 }
 
 void GameWorldView::MoveBy(const DrawPoint& numPixels)

diff --git a/libs/s25main/world/GameWorldView.h b/libs/s25main/world/GameWorldView.h
@@ -7,6 +7,7 @@
 #include "DrawPoint.h"
 #include "gameTypes/MapCoordinates.h"
 #include "gameTypes/MapTypes.h"
+#include <boost/signals2.hpp>
 #include <vector>
 
 class GameWorldBase;
@@ -80,27 +81,18 @@ class GameWorldView
     float GetCurrentTargetZoomFactor() const;
     void SetNextZoomFactor();
 
-    /// Bauqualitäten anzeigen oder nicht
-    void ToggleShowBQ()
-    {
-        show_bq = !show_bq;
-        SaveIngameSettingsValues();
-    }
-    /// Gebäudenamen zeigen oder nicht
-    void ToggleShowNames()
-    {
-        show_names = !show_names;
-        SaveIngameSettingsValues();
-    }
-    /// Produktivität zeigen oder nicht
-    void ToggleShowProductivity()
-    {
-        show_productivity = !show_productivity;
-        SaveIngameSettingsValues();
-    };
-    /// Schaltet Produktivitäten/Namen komplett aus oder an
+    /// Show or hide construction aid
+    void ToggleShowBQ();
+    /// Show or hide building names
+    void ToggleShowNames();
+    /// Show or hide productivity
+    void ToggleShowProductivity();
+    /// Toggle names and productivity completely on or off
     void ToggleShowNamesAndProductivity();
 
+    /// Copy visibility of HUD elements from this view to another
+    void CopyHudSettingsTo(GameWorldView& other, bool copyBQ) const;
+
     void Draw(const RoadBuildState& rb, MapPoint selected, bool drawMouse, unsigned* water = nullptr);
 
     /// Moves the map view by the given offset in pixels
@@ -128,6 +120,9 @@ class GameWorldView
 
     void Resize(const Extent& newSize);
 
+    /// Triggered when visibility of HUD elements changes
+    boost::signals2::signal<void()> onHudSettingsChanged;
+
 private:
     void CalcFxLx();
     void DrawBoundaryStone(const MapPoint& pt, DrawPoint pos, Visibility vis);