4 files changed, 41 insertions, 2 deletions

diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp
index 2307b33345..8b03dbbc2d 100644
--- a/scene/gui/graph_edit.cpp
+++ b/scene/gui/graph_edit.cpp
@@ -425,6 +425,7 @@ void GraphEdit::_top_layer_input(const InputEvent& p_ev) {
 									connecting_color=to->cast_to<GraphNode>()->get_connection_input_color(E->get().to_port);
 									connecting_target=false;
 									connecting_to=pos;
+									just_disconected=true;
 
 									emit_signal("disconnection_request",E->get().from,E->get().from_port,E->get().to,E->get().to_port);
 									to = get_node(String(connecting_from)); //maybe it was erased
@@ -446,6 +447,7 @@ void GraphEdit::_top_layer_input(const InputEvent& p_ev) {
 					connecting_color=gn->get_connection_output_color(j);
 					connecting_target=false;
 					connecting_to=pos;
+					just_disconected=false;
 					return;
 				}
 
@@ -474,6 +476,7 @@ void GraphEdit::_top_layer_input(const InputEvent& p_ev) {
 									connecting_color=fr->cast_to<GraphNode>()->get_connection_output_color(E->get().from_port);
 									connecting_target=false;
 									connecting_to=pos;
+									just_disconected=true;
 
 									emit_signal("disconnection_request",E->get().from,E->get().from_port,E->get().to,E->get().to_port);
 									fr = get_node(String(connecting_from)); //maybe it was erased
@@ -496,6 +499,8 @@ void GraphEdit::_top_layer_input(const InputEvent& p_ev) {
 					connecting_color=gn->get_connection_input_color(j);
 					connecting_target=false;
 					connecting_to=pos;
+					just_disconected=true;
+
 					return;
 				}
 
@@ -568,7 +573,7 @@ void GraphEdit::_top_layer_input(const InputEvent& p_ev) {
 			}
 			emit_signal("connection_request",from,from_slot,to,to_slot);
 
-		} else {
+		} else if (!just_disconected) {
 			String from = connecting_from;
 			int from_slot = connecting_index;
 			Vector2 ofs = Vector2(p_ev.mouse_button.x,p_ev.mouse_button.y);
@@ -1323,6 +1328,7 @@ GraphEdit::GraphEdit() {
 	zoom_hb->add_child(snap_amount);
 
 	setting_scroll_ofs=false;
+	just_disconected=false;
 
 
 
diff --git a/scene/gui/graph_edit.h b/scene/gui/graph_edit.h
index ed6e4ef6ac..c5174f6699 100644
--- a/scene/gui/graph_edit.h
+++ b/scene/gui/graph_edit.h
@@ -92,6 +92,7 @@ private:
 	Vector2 connecting_to;
 	String connecting_target_to;
 	int connecting_target_index;
+	bool just_disconected;
 
 	bool dragging;
 	bool just_selected;
diff --git a/scene/gui/graph_node.cpp b/scene/gui/graph_node.cpp
index 5ece970936..da298a795a 100644
--- a/scene/gui/graph_node.cpp
+++ b/scene/gui/graph_node.cpp
@@ -183,12 +183,39 @@ void GraphNode::_resort() {
 
 }
 
+bool GraphNode::has_point(const Point2& p_point) const {
+
+	if (comment) {
+		Ref<StyleBox> comment = get_stylebox("comment");
+		Ref<Texture> resizer =get_icon("resizer");
+
+		if (Rect2(get_size()-resizer->get_size(), resizer->get_size()).has_point(p_point)) {
+			return true;
+		}
+		if (Rect2(0,0,get_size().width,comment->get_margin(MARGIN_TOP)).has_point(p_point)) {
+			return true;
+		}
+
+		return false;
+
+	} else {
+		return Control::has_point(p_point);
+	}
+}
 
 void GraphNode::_notification(int p_what) {
 
 	if (p_what==NOTIFICATION_DRAW) {
 
-		Ref<StyleBox> sb=get_stylebox(comment? "comment": (selected ? "selectedframe" : "frame"));
+		Ref<StyleBox> sb;
+
+		if (comment) {
+			sb = get_stylebox( selected? "commentfocus" : "comment");
+
+		} else {
+
+			sb = get_stylebox( selected ? "selectedframe" : "frame");
+		}
 
 		sb=sb->duplicate();
 		sb->call("set_modulate",modulate);
@@ -601,6 +628,8 @@ void GraphNode::_input_event(const InputEvent& p_ev) {
 		ERR_EXPLAIN("GraphNode must be the child of a GraphEdit node.");
 		ERR_FAIL_COND(get_parent_control() == NULL);
 
+		print_line("INPUT EVENT BUTTON");
+
 		if(p_ev.mouse_button.pressed && p_ev.mouse_button.button_index==BUTTON_LEFT) {
 
 			Vector2 mpos = Vector2(p_ev.mouse_button.x,p_ev.mouse_button.y);
diff --git a/scene/gui/graph_node.h b/scene/gui/graph_node.h
index 7357ab5a45..cbfd34f556 100644
--- a/scene/gui/graph_node.h
+++ b/scene/gui/graph_node.h
@@ -93,6 +93,9 @@ private:
 	Overlay overlay;
 
 	Color modulate;
+
+	bool has_point(const Point2& p_point) const;
+
 protected: