3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

FDM supports gizmo: clicking the clipping plane starts painting

Browse source
This commit is contained in:
Lukas Matena 2020-05-28 12:54:22 +02:00
parent 2c244732db
commit b376e2c703
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
View file

@ -365,13 +365,23 @@ bool GLGizmoFdmSupports::gizmo_event(SLAGizmoEventType action, const Vec2d& mous
} }
} }
bool dragging_while_painting = (action == SLAGizmoEventType::Dragging && m_button_down != Button::None);
// The mouse button click detection is enabled when there is a valid hit
// or when the user clicks the clipping plane. Missing the object entirely
// shall not capture the mouse.
if (closest_hit_mesh_id != -1 || clipped_mesh_was_hit) {
if (m_button_down == Button::None)
m_button_down = ((action == SLAGizmoEventType::LeftDown) ? Button::Left : Button::Right);
}
if (closest_hit_mesh_id == -1) { if (closest_hit_mesh_id == -1) {
// In case we have no valid hit, we can return. The event will // In case we have no valid hit, we can return. The event will
// be stopped in following two cases: // be stopped in following two cases:
// 1. clicking the clipping plane // 1. clicking the clipping plane
// 2. dragging while painting (to prevent scene rotations and moving the object) // 2. dragging while painting (to prevent scene rotations and moving the object)
return clipped_mesh_was_hit return clipped_mesh_was_hit
|| (action == SLAGizmoEventType::Dragging && m_button_down != Button::None); || dragging_while_painting;
} }
// Now propagate the hits // Now propagate the hits
@ -472,10 +482,6 @@ bool GLGizmoFdmSupports::gizmo_event(SLAGizmoEventType action, const Vec2d& mous
} }
} }
if (m_button_down == Button::None)
m_button_down = ((action == SLAGizmoEventType::LeftDown) ? Button::Left : Button::Right);
return true; return true;
} }