mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH:disable right-click menu display in gizmo 

Jira: STUDIO-6417
Change-Id: I5e8d105280a159624fd131026f555877ed572f43
This commit is contained in:
zhou.xu 2024-03-08 09:23:57 +08:00 committed by Lane.Wei
parent 22056d5f7e
commit fc114bff4e
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -4423,7 +4423,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
logical_pos = logical_pos.cwiseQuotient(Vec2d(factor, factor));
#endif // ENABLE_RETINA_GL
if (!m_mouse.ignore_right_up) {
if (!m_mouse.ignore_right_up && m_gizmos.get_current_type() == GLGizmosManager::EType::Undefined) {
//BBS post right click event
if (!m_hover_plate_idxs.empty()) {
post_event(RBtnPlateEvent(EVT_GLCANVAS_PLATE_RIGHT_CLICK, { logical_pos, m_hover_plate_idxs.front() }));

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

@ -1011,9 +1011,7 @@ bool GLGizmosManager::on_mouse(wxMouseEvent& evt)
//wxGetApp().obj_manipul()->set_dirty();
processed = true;
}
else if (evt.RightUp() && (m_current == FdmSupports || m_current == Seam || m_current == MmuSegmentation || m_current == Cut
|| m_current == Measure || m_current == MeshBoolean)
&& !m_parent.is_mouse_dragging() ) {
else if (evt.RightUp() && m_current != EType::Undefined && !m_parent.is_mouse_dragging() ) {
gizmo_event(SLAGizmoEventType::RightUp, mouse_pos, evt.ShiftDown(), evt.AltDown(), control_down);
processed = true;
}