From 268b06bdbb7eaa433c663413d9c9387c7fb15d67 Mon Sep 17 00:00:00 2001
From: Filip Sykala <filip.sykala@prusa3d.cz>
Date: Mon, 16 Aug 2021 15:30:33 +0200
Subject: [PATCH] fix position of window

---
 src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp | 47 +++++++++++++++++------
 src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp |  2 +
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
index cdcf9ce1f..fa0b94200 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
@@ -53,10 +53,6 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi
     const int max_char_in_name = 25;
     create_gui_cfg();
 
-    int flag = ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoResize |
-               ImGuiWindowFlags_NoCollapse;
-    m_imgui->begin(on_get_name(), flag);
-
     const Selection &selection = m_parent.get_selection();
     int object_idx = selection.get_object_idx();
     ModelObject *obj = wxGetApp().plater()->model().objects[object_idx];
@@ -65,6 +61,12 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi
     // Check selection of new volume
     // Do not reselect object when processing 
     if (act_volume != volume && state == State::settings) {
+        bool change_window_position = (volume == nullptr);
+        // select different model
+        if (volume != nullptr && original_its.has_value()) {
+            set_its(*original_its);
+        }
+
         obj_index = object_idx; // to remember correct object
         volume = act_volume;
         original_its = {};
@@ -72,13 +74,30 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi
         c.wanted_percent = 50.;  // default value
         c.update_percent(tm.its.indices.size());
         is_valid_result = false;
-        // set window position
-        ImVec2 pos = ImGui::GetMousePos();
-        pos.x -= gui_cfg->window_offset;
-        pos.y -= gui_cfg->window_offset;
-        ImGui::SetWindowPos(pos, ImGuiCond_Always);
+
+        if (change_window_position) {
+            ImVec2 pos = ImGui::GetMousePos();
+            pos.x -= gui_cfg->window_offset;
+            pos.y -= gui_cfg->window_offset;
+            // minimal top left value
+            ImVec2 tl(gui_cfg->window_padding, gui_cfg->window_padding);
+            if (pos.x < tl.x) pos.x = tl.x;
+            if (pos.y < tl.y) pos.y = tl.y;
+            // maximal bottom right value
+            auto parent_size = m_parent.get_canvas_size();
+            ImVec2 br(
+                parent_size.get_width() - (2 * gui_cfg->window_offset + gui_cfg->window_padding), 
+                parent_size.get_height() - (2 * gui_cfg->window_offset + gui_cfg->window_padding));
+            if (pos.x > br.x) pos.x = br.x;
+            if (pos.y > br.y) pos.y = br.y;
+            ImGui::SetNextWindowPos(pos, ImGuiCond_Always);
+        }
     }
 
+    int flag = ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoResize |
+               ImGuiWindowFlags_NoCollapse;
+    m_imgui->begin(on_get_name(), flag);
+
     size_t triangle_count = volume->mesh().its.indices.size();
     // already reduced mesh
     if (original_its.has_value())
@@ -211,8 +230,6 @@ void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limi
 }
 
 void GLGizmoSimplify::close() {
-    volume = nullptr;
-    
     // close gizmo == open it again
     GLGizmosManager &gizmos_mgr = m_parent.get_gizmos_manager();
     gizmos_mgr.open_gizmo(GLGizmosManager::EType::Simplify);
@@ -293,6 +310,14 @@ bool GLGizmoSimplify::on_is_activable() const
     return !m_parent.get_selection().is_empty();
 }
 
+void GLGizmoSimplify::on_set_state() 
+{ 
+    // Closing gizmo. e.g. selecting another one
+    if (m_state == GLGizmoBase::Off) {
+        volume = nullptr;            
+    }
+}
+
 void GLGizmoSimplify::create_gui_cfg() { 
     if (gui_cfg.has_value()) return;
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
index bd3637360..cefd1abf0 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
@@ -41,6 +41,7 @@ protected:
     virtual void on_render_input_window(float x, float y, float bottom_limit) override;
     virtual bool on_is_activable() const override;
     virtual bool on_is_selectable() const override { return false; }
+    virtual void on_set_state() override;
 
 private:
     void close();
@@ -78,6 +79,7 @@ private:
         int input_width       = 100;
         int input_small_width = 80;
         int window_offset     = 100;
+        int window_padding    = 0;
     };
     std::optional<GuiCfg> gui_cfg;
     void create_gui_cfg();