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

Merge branch 'master'

Browse Source
This commit is contained in:
omigamedev
2019-08-28 12:10:58 +02:00
parent e0c6635dc7 c1bd377ee8
commit 4651d81955
19 changed files with 174 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/node.h
View File

@@ -103,9 +103,9 @@ public:
uint16_t m_nodeID;
std::string m_nodeID_s;
std::vector<std::shared_ptr<Node>> m_children;
Node* current_mouse_capture = nullptr;
Node* current_key_capture = nullptr;
Node* child_mouse_focus = nullptr;
std::shared_ptr<Node> current_mouse_capture = nullptr;
std::shared_ptr<Node> current_key_capture = nullptr;
std::shared_ptr<Node> child_mouse_focus = nullptr;
bool m_mouse_captured = false;
bool m_key_captured = false;
@@ -117,7 +117,7 @@ public:
bool m_force_mouse_capture = false;
bool m_capture_children = true; // wether to capture children events when xx_capture() is used
bool m_destroyed = false;
std::vector<Node*> m_capture_stack;
std::vector<std::shared_ptr<Node>> m_capture_stack;
bool m_mouse_ignore = true;
float m_zoom = 1.f;