From 6d3572270c0312fa1fd30728772f0e5860da50ba Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Tue, 21 Nov 2023 16:44:49 +0800 Subject: [PATCH] ENH:cancel EnterReturnsTrue for imgui in cut Jira: STUDIO-5269 Change-Id: Ifc4b183a4e4c4fdb4f47742f14f70a1ed93fa056 Signed-off-by: zhou.xu --- src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp index 9c20ba208..bbc2b655b 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp @@ -1924,6 +1924,7 @@ void GLGizmoAdvancedCut::render_cut_plane_input_window(float x, float y, float b update_plate_normal_boundingbox_clipper(tran.get_matrix()); reset_cut_by_contours(); Plater::TakeSnapshot snapshot(wxGetApp().plater(), "Rotate cut plane"); + m_start_dragging_m = m_rotate_matrix; // for takeshot } ImGui::Separator(); @@ -1944,6 +1945,7 @@ void GLGizmoAdvancedCut::render_cut_plane_input_window(float x, float y, float b m_buffered_movement = m_movement = 0.0; m_buffered_height = m_plane_center.z();//update m_buffered_height Plater::TakeSnapshot snapshot(wxGetApp().plater(), "set z along z axis for cut plane"); + m_ar_plane_center = m_plane_center; } // height input box @@ -1959,7 +1961,9 @@ void GLGizmoAdvancedCut::render_cut_plane_input_window(float x, float y, float b if (m_last_active_item_imgui != current_active_id && std::abs(m_buffered_height - m_plane_center.z()) > EPSILON) { update_plate_center(Axis::Z, m_buffered_height - m_plane_center.z(), false); reset_cut_by_contours(); + Plater::TakeSnapshot snapshot(wxGetApp().plater(), "set height for cut plane"); + m_ar_plane_center = m_plane_center; } ImGui::PopStyleVar(1); m_imgui->disabled_end();