GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-09-21 14:13:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix dragging out of window

Browse Source
This commit is contained in:
Filip Sykala 2022-02-09 15:16:17 +01:00
parent 0c40e2f8c8
commit 5f51811a3c
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
View File

@ -150,13 +150,14 @@ void GLGizmoBase::render_grabbers_for_picking(const BoundingBoxf3& box) const
// help function to process grabbers // help function to process grabbers
// call start_dragging, stop_dragging, on_dragging // call start_dragging, stop_dragging, on_dragging
bool GLGizmoBase::use_grabbers(const wxMouseEvent &mouse_event) { bool GLGizmoBase::use_grabbers(const wxMouseEvent &mouse_event) {
bool is_dragging_finished = false;
if (mouse_event.Moving()) { if (mouse_event.Moving()) {
// it should not happen but for sure
assert(!m_dragging); assert(!m_dragging);
// only for sure if (m_dragging) is_dragging_finished = true;
if (m_dragging) m_dragging = false; else return false;
}
return false;
}
if (mouse_event.LeftDown()) { if (mouse_event.LeftDown()) {
Selection &selection = m_parent.get_selection(); Selection &selection = m_parent.get_selection();
if (!selection.is_empty() && m_hover_id != -1) { if (!selection.is_empty() && m_hover_id != -1) {
@ -178,6 +179,8 @@ bool GLGizmoBase::use_grabbers(const wxMouseEvent &mouse_event) {
return true; return true;
} }
} else if (m_dragging) { } else if (m_dragging) {
// when mouse cursor leave window than finish actual dragging operation
bool is_leaving = mouse_event.Leaving();
if (mouse_event.Dragging()) { if (mouse_event.Dragging()) {
m_parent.set_mouse_as_dragging(); m_parent.set_mouse_as_dragging();
Point mouse_coord(mouse_event.GetX(), mouse_event.GetY()); Point mouse_coord(mouse_event.GetX(), mouse_event.GetY());
@ -189,10 +192,14 @@ bool GLGizmoBase::use_grabbers(const wxMouseEvent &mouse_event) {
wxGetApp().obj_manipul()->set_dirty(); wxGetApp().obj_manipul()->set_dirty();
m_parent.set_as_dirty(); m_parent.set_as_dirty();
return true; return true;
} else if (mouse_event.LeftUp()) { } else if (mouse_event.LeftUp() || is_leaving || is_dragging_finished) {
for (auto &grabber : m_grabbers) grabber.dragging = false; for (auto &grabber : m_grabbers) grabber.dragging = false;
m_dragging = false; m_dragging = false;
// NOTE: This should be part of GLCanvas3D
// Reset hover_id when leave window
if (is_leaving) m_parent.mouse_up_cleanup();
on_stop_dragging(); on_stop_dragging();
// There is prediction that after draggign, data are changed // There is prediction that after draggign, data are changed
@ -209,8 +216,6 @@ bool GLGizmoBase::use_grabbers(const wxMouseEvent &mouse_event) {
// updates camera target constraints // updates camera target constraints
m_parent.refresh_camera_scene_box(); m_parent.refresh_camera_scene_box();
return true; return true;
} else if (mouse_event.Leaving()) {
m_dragging = false;
} }
} }
return false; return false;