Merge branch 'track_debug_window' into 'master'

Track debug window

See merge request OpenMW/openmw!3504

apps/openmw/mwgui/settings.cpp

@@ -99,6 +99,25 @@ namespace MWGui
         };
     }
 
+    WindowSettingValues makeDebugWindowSettingValues()
+    {
+        return WindowSettingValues{
+            .mRegular = WindowRectSettingValues {
+                .mX = Settings::windows().mDebugX,
+                .mY = Settings::windows().mDebugY,
+                .mW = Settings::windows().mDebugW,
+                .mH = Settings::windows().mDebugH,
+            },
+            .mMaximized = WindowRectSettingValues {
+                .mX = Settings::windows().mDebugMaximizedX,
+                .mY = Settings::windows().mDebugMaximizedY,
+                .mW = Settings::windows().mDebugMaximizedW,
+                .mH = Settings::windows().mDebugMaximizedH,
+            },
+            .mIsMaximized = Settings::windows().mDebugMaximized,
+        };
+    }
+
     WindowSettingValues makeDialogueWindowSettingValues()
     {
         return WindowSettingValues{

apps/openmw/mwgui/settings.hpp

@@ -25,6 +25,7 @@ namespace MWGui
     WindowSettingValues makeCompanionWindowSettingValues();
     WindowSettingValues makeConsoleWindowSettingValues();
     WindowSettingValues makeContainerWindowSettingValues();
+    WindowSettingValues makeDebugWindowSettingValues();
     WindowSettingValues makeDialogueWindowSettingValues();
     WindowSettingValues makeInventoryWindowSettingValues();
     WindowSettingValues makeInventoryBarterWindowSettingValues();

apps/openmw/mwgui/windowmanagerimp.cpp

@@ -498,6 +498,7 @@ namespace MWGui
         auto debugWindow = std::make_unique<DebugWindow>();
         mDebugWindow = debugWindow.get();
         mWindows.push_back(std::move(debugWindow));
+        trackWindow(mDebugWindow, makeDebugWindowSettingValues());
 
         auto postProcessorHud = std::make_unique<PostProcessorHud>();
         mPostProcessorHud = postProcessorHud.get();

components/settings/categories/windows.hpp

@@ -161,6 +161,15 @@ namespace Settings
         SettingValue<float> mPostprocessorMaximizedW{ mIndex, "Windows", "postprocessor maximized w" };
         SettingValue<float> mPostprocessorMaximizedH{ mIndex, "Windows", "postprocessor maximized h" };
         SettingValue<bool> mPostprocessorMaximized{ mIndex, "Windows", "postprocessor maximized" };
+        SettingValue<float> mDebugX{ mIndex, "Windows", "debug x" };
+        SettingValue<float> mDebugY{ mIndex, "Windows", "debug y" };
+        SettingValue<float> mDebugW{ mIndex, "Windows", "debug w" };
+        SettingValue<float> mDebugH{ mIndex, "Windows", "debug h" };
+        SettingValue<float> mDebugMaximizedX{ mIndex, "Windows", "debug maximized x" };
+        SettingValue<float> mDebugMaximizedY{ mIndex, "Windows", "debug maximized y" };
+        SettingValue<float> mDebugMaximizedW{ mIndex, "Windows", "debug maximized w" };
+        SettingValue<float> mDebugMaximizedH{ mIndex, "Windows", "debug maximized h" };
+        SettingValue<bool> mDebugMaximized{ mIndex, "Windows", "debug maximized" };
     };
 }
 

files/settings-default.cfg

@@ -847,6 +847,17 @@ postprocessor maximized w = 0.97
 postprocessor maximized h = 0.875
 postprocessor maximized = false
 
+# Debug window for viewing logs and profiling
+debug x = 0.70
+debug y = 0.00
+debug w = 0.30
+debug h = 1.00
+debug maximized x = 0.015
+debug maximized y = 0.02
+debug maximized w = 0.97
+debug maximized h = 0.875
+debug maximized = false
+
 [Navigator]
 
 # Enable navigator (true, false). When enabled background threads are started to build navmesh for world geometry.