diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-10-17 15:31:23 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-10-17 15:31:23 -0300 |
commit | 1db523d0bb8864a3a523fe1e68769c9f125937c9 (patch) | |
tree | 5202a2b02c79798ca1b4420cddb7927951ff6ec3 /scene/gui/graph_edit.h | |
parent | be0f7563fbff581ca072504978bedc6a55e180f1 (diff) | |
parent | 25324aa5061b07df6da877e94c8c23fbe7f34f6e (diff) | |
download | redot-engine-1db523d0bb8864a3a523fe1e68769c9f125937c9.tar.gz |
Merge pull request #2274 from MarianoGnu/master
Improve Visual Shader Editor responsiveness
Diffstat (limited to 'scene/gui/graph_edit.h')
-rw-r--r-- | scene/gui/graph_edit.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/scene/gui/graph_edit.h b/scene/gui/graph_edit.h index 0a9da73ab6..44f5a369c2 100644 --- a/scene/gui/graph_edit.h +++ b/scene/gui/graph_edit.h @@ -10,7 +10,7 @@ class GraphEditFilter : public Control { OBJ_TYPE(GraphEditFilter,Control); -friend class GraphEdit; + friend class GraphEdit; GraphEdit *ge; virtual bool has_point(const Point2& p_point) const; @@ -49,7 +49,16 @@ private: String connecting_target_to; int connecting_target_index; + bool dragging; + bool just_selected; + Vector2 drag_accum; + bool box_selecting; + bool box_selection_mode_aditive; + Point2 box_selecting_from; + Point2 box_selecting_to; + Rect2 box_selecting_rect; + List<GraphNode*> previus_selected; bool right_disconnects; bool updating; @@ -71,7 +80,7 @@ private: Array _get_connection_list() const; -friend class GraphEditFilter; + friend class GraphEditFilter; bool _filter_input(const Point2& p_point); protected: |