GUI: Settings window always pop at the top-left corner

pierre-dejoue · Aug 26, 2023 · 45be54d · 45be54d
1 parent 3544dc3
commit 45be54d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/gui/src/main.cpp b/src/gui/src/main.cpp
@@ -55,6 +55,10 @@ struct AppWindows
 {
     std::unique_ptr<SettingsWindow> settings;
     std::vector<std::unique_ptr<PicrossFile>> picross;
+    struct
+    {
+        WindowLayout settings;
+    } layout;
 };
 
 void main_menu_bar(AppWindows& windows, bool& application_should_close, bool& gui_dark_mode)
@@ -185,7 +189,7 @@ int main(int argc, char *argv[])
         if (windows.settings)
         {
             bool can_be_erased = false;
-            windows.settings->visit(can_be_erased);
+            windows.settings->visit(can_be_erased, windows.layout.settings);
             assert(can_be_erased == false);     // Always ON
         }
 
@@ -195,7 +199,7 @@ int main(int argc, char *argv[])
 #endif
 
         // We delay the Settings window opening until after the first ImGui rendering pass so that the actual work space
-        // is known on first visit. This may be important for ImGui::Set* functions with ImGuiCond_Once.
+        // is known on first visit(). This is important for ImGui::Set* functions with flag ImGuiCond_Once.
         if (!windows.settings) { windows.settings = std::make_unique<SettingsWindow>(settings); }
 
         // Rendering

diff --git a/src/gui/src/settings_window.cpp b/src/gui/src/settings_window.cpp
@@ -3,6 +3,7 @@
 #include "settings.h"
 
 #include <imgui_wrap.h>
+#include "imgui_helpers.h"
 
 #include <cassert>
 
@@ -13,12 +14,13 @@ SettingsWindow::SettingsWindow(Settings& settings)
 {
 }
 
-void SettingsWindow::visit(bool& can_be_erased)
+void SettingsWindow::visit(bool& can_be_erased, const WindowLayout& win_pos_sz)
 {
     can_be_erased = false;        // Cannot close
 
     ImGui::SetNextWindowSizeConstraints(ImVec2(0, 300), ImVec2(FLT_MAX, 600));
 
+    ImGui::SetNextWindowPosAndSize(win_pos_sz, ImGuiCond_Once);
     constexpr ImGuiWindowFlags win_flags = ImGuiWindowFlags_AlwaysAutoResize
                                          | ImGuiWindowFlags_NoSavedSettings;
 

diff --git a/src/gui/src/settings_window.h b/src/gui/src/settings_window.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "window_layout.h"
+
 #include <string>
 
 class Settings;
@@ -11,7 +13,7 @@ class SettingsWindow
     SettingsWindow(const SettingsWindow&) = delete;
     SettingsWindow& operator=(const SettingsWindow&) = delete;
 
-    void visit(bool& can_be_erased);
+    void visit(bool& can_be_erased, const WindowLayout& win_pos_sz);
 
 private:
     struct Animation