[UPD] : update ImGui to Docking branch

aiekick · Jul 24, 2024 · d366f03 · d366f03
1 parent 2741488
commit d366f03
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 9 deletions.
diff --git a/3rdparty/imgui b/3rdparty/imgui
diff --git a/DemoDialog.cpp b/DemoDialog.cpp
@@ -494,7 +494,7 @@ void DemoDialog::init(const float& vFontSize) {
 #endif  // USE_PLACES_FEATURE
 }
 
-void DemoDialog::display(const int32_t& vDisplayWidth, const int32_t& vDisplayHeight) {
+void DemoDialog::display(const ImVec4& vDisplayRect) {
     // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
     if (show_demo_window) ImGui::ShowDemoWindow(&show_demo_window);
 
@@ -873,7 +873,7 @@ void DemoDialog::display(const int32_t& vDisplayWidth, const int32_t& vDisplayHe
         ImVec2 maxSize = ImVec2(FLT_MAX, FLT_MAX);
 
         if (UseWindowContraints) {
-            maxSize = ImVec2((float)vDisplayWidth, (float)vDisplayHeight) * 0.7f;
+            maxSize = ImVec2(vDisplayRect.z, vDisplayRect.w) * 0.7f;
             minSize = maxSize * 0.25f;
         }
 

diff --git a/DemoDialog.h b/DemoDialog.h
@@ -30,7 +30,7 @@ class DemoDialog {
 
 public:
     void init(const float& vFontSize);
-    void display(const int32_t& vDisplayWidth, const int32_t& vDisplayHeight);
+    void display(const ImVec4& vDisplayRect);
     void manageGPU();
     void unit();
 };
diff --git a/ImGuiFileDialog b/ImGuiFileDialog
diff --git a/mainWinLinuxMacos.cpp b/mainWinLinuxMacos.cpp
@@ -108,9 +108,10 @@ int main(int, char**) {
     (void)io;
     // io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;     // Enable Keyboard Controls
     // io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;      // Enable Gamepad Controls
-    // io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;    // Enable Docking
-    // io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;  // Enable Multi-Viewport / Platform Windows
-    io.FontAllowUserScaling = true;  // zoom wiht ctrl + mouse wheel
+    io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;    // Enable Docking
+    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;  // Enable Multi-Viewport / Platform Windows
+    io.ConfigViewportsNoDecoration = false;              // no decoration, for avoid a resuize bug
+    io.FontAllowUserScaling        = true;               // zoom wiht ctrl + mouse wheel
 
     // Setup Platform/Renderer bindings
     ImGui_ImplGlfw_InitForOpenGL(window, true);
@@ -119,6 +120,8 @@ int main(int, char**) {
     DemoDialog demoDialog;
     demoDialog.init(15.0f);   
 
+   ImVec4 viewportRect;
+
     // Main loop
     int32_t display_w = 0;
     int32_t display_h = 0;
@@ -137,8 +140,25 @@ int main(int, char**) {
         ImGui_ImplGlfw_NewFrame();
         ImGui::NewFrame();
 
+#ifdef IMGUI_HAS_VIEWPORT
+        if (io.ConfigFlags & ImGuiConfigFlags_ViewportsEnable) {
+            const auto viewport = ImGui::GetMainViewport();
+            if (viewport) {
+                const auto pos  = viewport->WorkPos;
+                const auto size = viewport->WorkSize;
+                viewportRect.x  = pos.x;
+                viewportRect.y  = pos.y;
+                viewportRect.z  = size.x;
+                viewportRect.w  = size.y;
+            }
+        } else {
+            viewportRect.x = 0;
+            viewportRect.y = 0;
+        }
+#endif
+
         try {
-            demoDialog.display(display_w, display_h);
+            demoDialog.display(viewportRect);
         } catch (std::exception& ex) {
             std::cout << "exception catched with message : " << ex.what() << std::endl;
             assert(0);