GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-09-24 07:33:14 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

ENH:cancel EnterReturnsTrue for imgui in cut

Browse Source 
Jira: STUDIO-5269
Change-Id: Ifc4b183a4e4c4fdb4f47742f14f70a1ed93fa056
Signed-off-by: zhou.xu <zhou.xu@bambulab.com>
This commit is contained in:
zhou.xu 2023-11-21 16:44:49 +08:00 committed by Lane.Wei
parent 6e8ff40ad5
commit 6d3572270c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp
View File

@ -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()); update_plate_normal_boundingbox_clipper(tran.get_matrix());
reset_cut_by_contours(); reset_cut_by_contours();
Plater::TakeSnapshot snapshot(wxGetApp().plater(), "Rotate cut plane"); Plater::TakeSnapshot snapshot(wxGetApp().plater(), "Rotate cut plane");
m_start_dragging_m = m_rotate_matrix; // for takeshot
} }
ImGui::Separator(); 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_movement = m_movement = 0.0;
m_buffered_height = m_plane_center.z();//update m_buffered_height m_buffered_height = m_plane_center.z();//update m_buffered_height
Plater::TakeSnapshot snapshot(wxGetApp().plater(), "set z along z axis for cut plane"); Plater::TakeSnapshot snapshot(wxGetApp().plater(), "set z along z axis for cut plane");
m_ar_plane_center = m_plane_center;
} }
// height input box // 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) { 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); update_plate_center(Axis::Z, m_buffered_height - m_plane_center.z(), false);
reset_cut_by_contours(); reset_cut_by_contours();
Plater::TakeSnapshot snapshot(wxGetApp().plater(), "set height for cut plane"); Plater::TakeSnapshot snapshot(wxGetApp().plater(), "set height for cut plane");
m_ar_plane_center = m_plane_center;
} }
ImGui::PopStyleVar(1); ImGui::PopStyleVar(1);
m_imgui->disabled_end(); m_imgui->disabled_end();