asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

-Forgot to add clips input to graphedit, fixes #3420

Browse source
This commit is contained in:
Juan Linietsky 2016-01-23 18:49:26 -03:00
parent 5ca338bab6
commit a2992d5955
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scene/gui/graph_edit.cpp
View file

@ -2,6 +2,8 @@
#include "os/input.h" #include "os/input.h"
#include "os/keyboard.h" #include "os/keyboard.h"
#include "scene/gui/box_container.h" #include "scene/gui/box_container.h"
bool GraphEditFilter::has_point(const Point2& p_point) const { bool GraphEditFilter::has_point(const Point2& p_point) const {
return ge->_filter_input(p_point); 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<Connection> *r_connections) const { void GraphEdit::get_connection_list(List<Connection> *r_connections) const {
*r_connections=connections; *r_connections=connections;

2
scene/gui/graph_edit.h
View file

@ -93,7 +93,7 @@ protected:
virtual void add_child_notify(Node *p_child); virtual void add_child_notify(Node *p_child);
virtual void remove_child_notify(Node *p_child); virtual void remove_child_notify(Node *p_child);
void _notification(int p_what); void _notification(int p_what);
virtual bool clips_input() const;
public: public:
Error connect_node(const StringName& p_from, int p_from_port,const StringName& p_to,int p_to_port); Error connect_node(const StringName& p_from, int p_from_port,const StringName& p_to,int p_to_port);

1
scene/gui/graph_node.h
View file

@ -49,6 +49,7 @@ class GraphNode : public Container {
bool selected; bool selected;
protected: protected:
void _input_event(const InputEvent& p_ev); void _input_event(const InputEvent& p_ev);
void _notification(int p_what); void _notification(int p_what);
static void _bind_methods(); static void _bind_methods();