From a2992d5955ff4f84f829dcab4859b4f5b5399a2c Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sat, 23 Jan 2016 18:49:26 -0300 Subject: -Forgot to add clips input to graphedit, fixes #3420 --- scene/gui/graph_edit.cpp | 7 +++++++ scene/gui/graph_edit.h | 2 +- scene/gui/graph_node.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index d0c82c15b8..9472c589ca 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -2,6 +2,8 @@ #include "os/input.h" #include "os/keyboard.h" #include "scene/gui/box_container.h" + + bool GraphEditFilter::has_point(const Point2& p_point) const { return ge->_filter_input(p_point); @@ -54,6 +56,11 @@ void GraphEdit::disconnect_node(const StringName& p_from, int p_from_port,const } } +bool GraphEdit::clips_input() const { + + return true; +} + void GraphEdit::get_connection_list(List *r_connections) const { *r_connections=connections; diff --git a/scene/gui/graph_edit.h b/scene/gui/graph_edit.h index ec278827b1..fe9c36cee4 100644 --- a/scene/gui/graph_edit.h +++ b/scene/gui/graph_edit.h @@ -93,7 +93,7 @@ protected: virtual void add_child_notify(Node *p_child); virtual void remove_child_notify(Node *p_child); void _notification(int p_what); - + virtual bool clips_input() const; public: Error connect_node(const StringName& p_from, int p_from_port,const StringName& p_to,int p_to_port); diff --git a/scene/gui/graph_node.h b/scene/gui/graph_node.h index 201529380d..dc407a6809 100644 --- a/scene/gui/graph_node.h +++ b/scene/gui/graph_node.h @@ -49,6 +49,7 @@ class GraphNode : public Container { bool selected; protected: + void _input_event(const InputEvent& p_ev); void _notification(int p_what); static void _bind_methods(); -- cgit v1.2.3