omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix mouse capture bug

Browse Source
This commit is contained in:
omigamedev
2017-08-19 16:59:05 +01:00
parent da4bfff69b
commit a2b888efd6
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
engine/node.cpp
View File

@@ -286,12 +286,19 @@ glm::vec4 Node::get_children_rect() const
void Node::mouse_capture() void Node::mouse_capture()
{ {
// already owner of capture
if (root()->current_mouse_capture == this)
return;
// cancel previous owner
if (auto n = root()->current_mouse_capture) if (auto n = root()->current_mouse_capture)
{ {
MouseEvent e; MouseEvent e;
e.m_type = kEventType::MouseCancel; e.m_type = kEventType::MouseCancel;
n->handle_event(&e); n->handle_event(&e);
} }
// make current
root()->current_mouse_capture = this; root()->current_mouse_capture = this;
m_mouse_captured = true; m_mouse_captured = true;
} }

1
engine/node_canvas.cpp
View File

@@ -284,4 +284,5 @@ void NodeCanvas::reset_camera()
m_canvas->m_cam_rot = {0, 0}; m_canvas->m_cam_rot = {0, 0};
m_canvas->m_cam_pos = {0, 0, 0}; m_canvas->m_cam_pos = {0, 0, 0};
m_canvas->m_cam_fov = 85; m_canvas->m_cam_fov = 85;
m_canvas->m_pan = {0, 0};
} }