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

Changed logic for releasing mouse capture into GLToolbar::on_mouse()

Browse source
This commit is contained in:
Enrico Turri 2019-03-22 13:03:34 +01:00
parent f5516f24c4
commit db21c67f18
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/slic3r/GUI/GLToolbar.cpp
View file

@ -411,24 +411,19 @@ bool GLToolbar::on_mouse(wxMouseEvent& evt, GLCanvas3D& parent)
// mouse anywhere // mouse anywhere
if (evt.Moving()) if (evt.Moving())
{
m_tooltip = update_hover_state(mouse_pos, parent); m_tooltip = update_hover_state(mouse_pos, parent);
if ((m_mouse_capture.parent != nullptr) && (m_mouse_capture.parent != &parent))
m_mouse_capture.reset();
}
else if (evt.LeftUp()) else if (evt.LeftUp())
m_mouse_capture.left = false; m_mouse_capture.left = false;
else if (evt.MiddleUp()) else if (evt.MiddleUp())
m_mouse_capture.middle = false; m_mouse_capture.middle = false;
else if (evt.RightUp()) else if (evt.RightUp())
m_mouse_capture.right = false; m_mouse_capture.right = false;
else if (m_mouse_capture.any()) else if (evt.Dragging() && m_mouse_capture.any())
{ processed = true;
if (evt.Dragging())
processed = true;
else if (evt.Entering() && (m_mouse_capture.parent == &parent))
// Resets the mouse capture state to avoid setting the dragging event as processed when, for example,
// the item action opens a modal dialog
// Keeps the mouse capture state if the entering event happens on different parent from the one
// who received the button down event, to prevent, for example, dragging when switching between scene views
m_mouse_capture.reset();
}
int item_id = contains_mouse(mouse_pos, parent); int item_id = contains_mouse(mouse_pos, parent);
if (item_id == -1) if (item_id == -1)