Merge branch 'master' of https://github.com/okamstudio/godot

5 files changed, 417 insertions, 210 deletions

diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp
index 3cd0dd3d16..deb3151798 100644
--- a/scene/gui/graph_edit.cpp
+++ b/scene/gui/graph_edit.cpp
@@ -141,9 +141,6 @@ void GraphEdit::_graph_node_moved(Node *p_gn) {
 
 	GraphNode *gn=p_gn->cast_to<GraphNode>();
 	ERR_FAIL_COND(!gn);
-
-	//gn->set_pos(gn->get_offset()+scroll_offset);
-
 	top_layer->update();
 }
 
@@ -172,7 +169,6 @@ void GraphEdit::remove_child_notify(Node *p_child) {
 void GraphEdit::_notification(int p_what) {
 
 	if (p_what==NOTIFICATION_READY) {
-		Size2 size = top_layer->get_size();
 		Size2 hmin = h_scroll->get_combined_minimum_size();
 		Size2 vmin = v_scroll->get_combined_minimum_size();
 
@@ -491,7 +487,8 @@ void GraphEdit::_top_layer_draw() {
 		connections.erase(to_erase.front()->get());
 		to_erase.pop_front();
 	}
-	//draw connections
+	if (box_selecting)
+		top_layer->draw_rect(box_selecting_rect,Color(0.7,0.7,1.0,0.3));
 }
 
 void GraphEdit::_input_event(const InputEvent& p_ev) {
@@ -500,6 +497,187 @@ void GraphEdit::_input_event(const InputEvent& p_ev) {
 		h_scroll->set_val( h_scroll->get_val() - p_ev.mouse_motion.relative_x );
 		v_scroll->set_val( v_scroll->get_val() - p_ev.mouse_motion.relative_y );
 	}
+
+	if (p_ev.type==InputEvent::MOUSE_MOTION && dragging) {
+
+		just_selected=true;
+		drag_accum+=Vector2(p_ev.mouse_motion.relative_x,p_ev.mouse_motion.relative_y);
+		for(int i=get_child_count()-1;i>=0;i--) {
+			GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+			if (gn && gn->is_selected())
+				gn->set_offset(gn->get_drag_from()+drag_accum);
+		}
+	}
+
+	if (p_ev.type==InputEvent::MOUSE_MOTION && box_selecting) {
+		box_selecting_to = get_local_mouse_pos();
+
+		box_selecting_rect = Rect2(MIN(box_selecting_from.x,box_selecting_to.x),
+								   MIN(box_selecting_from.y,box_selecting_to.y),
+								   ABS(box_selecting_from.x-box_selecting_to.x),
+								   ABS(box_selecting_from.y-box_selecting_to.y));
+
+		for(int i=get_child_count()-1;i>=0;i--) {
+
+			GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+			if (!gn)
+				continue;
+
+			bool in_box = gn->get_rect().intersects(box_selecting_rect);
+
+			if (in_box)
+				gn->set_selected(box_selection_mode_aditive);
+			else
+				gn->set_selected(previus_selected.find(gn)!=NULL);
+		}
+
+		top_layer->update();
+	}
+
+	if (p_ev.type==InputEvent::MOUSE_BUTTON) {
+
+		const InputEventMouseButton &b=p_ev.mouse_button;
+
+		if (b.button_index==BUTTON_RIGHT && b.pressed)
+		{
+			if (box_selecting) {
+				box_selecting = false;
+				for(int i=get_child_count()-1;i>=0;i--) {
+
+					GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+					if (!gn)
+						continue;
+
+					gn->set_selected(previus_selected.find(gn)!=NULL);
+				}
+				top_layer->update();
+			} else {
+				emit_signal("popup_request", Vector2(b.global_x, b.global_y));
+			}
+		}
+
+		if (b.button_index==BUTTON_LEFT && !b.pressed && dragging) {
+			if (!just_selected && drag_accum==Vector2() && Input::get_singleton()->is_key_pressed(KEY_CONTROL)) {
+				//deselect current node
+				for(int i=get_child_count()-1;i>=0;i--) {
+					GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+
+					if (gn && gn->get_rect().has_point(get_local_mouse_pos()))
+						gn->set_selected(false);
+				}
+			}
+
+			if (drag_accum!=Vector2()) {
+
+				emit_signal("_begin_node_move");
+
+				for(int i=get_child_count()-1;i>=0;i--) {
+					GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+					if (gn && gn->is_selected())
+						gn->set_drag(false);
+				}
+
+				emit_signal("_end_node_move");
+			}
+
+			dragging = false;
+
+			top_layer->update();
+		}
+
+		if (b.button_index==BUTTON_LEFT && b.pressed) {
+
+			GraphNode *gn;
+			for(int i=get_child_count()-1;i>=0;i--) {
+
+				gn=get_child(i)->cast_to<GraphNode>();
+
+				if (gn && gn->get_rect().has_point(get_local_mouse_pos()))
+					break;
+			}
+
+			if (gn) {
+
+				if (_filter_input(Vector2(b.x,b.y)))
+					return;
+
+				dragging = true;
+				drag_accum = Vector2();
+				just_selected = !gn->is_selected();
+				if(!gn->is_selected() && !Input::get_singleton()->is_key_pressed(KEY_CONTROL)) {
+					for (int i = 0; i < get_child_count(); i++) {
+						GraphNode *o_gn = get_child(i)->cast_to<GraphNode>();
+						if (o_gn)
+							o_gn->set_selected(o_gn == gn);
+					}
+				}
+
+				gn->set_selected(true);
+				for (int i = 0; i < get_child_count(); i++) {
+					GraphNode *o_gn = get_child(i)->cast_to<GraphNode>();
+					if (!o_gn)
+						continue;
+					if (o_gn->is_selected())
+						o_gn->set_drag(true);
+				}
+
+			} else {
+				box_selecting = true;
+				box_selecting_from = get_local_mouse_pos();
+				if (b.mod.control) {
+					box_selection_mode_aditive = true;
+					previus_selected.clear();
+					for(int i=get_child_count()-1;i>=0;i--) {
+
+						GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+						if (!gn || !gn->is_selected())
+							continue;
+
+						previus_selected.push_back(gn);
+					}
+				} else if (b.mod.shift) {
+					box_selection_mode_aditive = false;
+					previus_selected.clear();
+					for(int i=get_child_count()-1;i>=0;i--) {
+
+						GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+						if (!gn || !gn->is_selected())
+							continue;
+
+						previus_selected.push_back(gn);
+					}
+				} else {
+					box_selection_mode_aditive = true;
+					previus_selected.clear();
+					for(int i=get_child_count()-1;i>=0;i--) {
+
+						GraphNode *gn=get_child(i)->cast_to<GraphNode>();
+						if (!gn)
+							continue;
+
+						gn->set_selected(false);
+					}
+				}
+			}
+		}
+
+		if (b.button_index==BUTTON_LEFT && !b.pressed && box_selecting) {
+			box_selecting = false;
+			previus_selected.clear();
+			top_layer->update();
+		}
+	}
+
+	if (p_ev.type==InputEvent::KEY && p_ev.key.scancode==KEY_D && p_ev.key.pressed && p_ev.key.mod.command) {
+		emit_signal("duplicate_nodes_request");
+		accept_event();
+	}
+
+	if (p_ev.type==InputEvent::KEY && p_ev.key.scancode==KEY_DELETE && p_ev.key.pressed) {
+		emit_signal("delete_nodes_request");
+		accept_event();
+	}
+
 }
 
 void GraphEdit::clear_connections() {
@@ -555,12 +733,18 @@ void GraphEdit::_bind_methods() {
 
 	ADD_SIGNAL(MethodInfo("connection_request",PropertyInfo(Variant::STRING,"from"),PropertyInfo(Variant::INT,"from_slot"),PropertyInfo(Variant::STRING,"to"),PropertyInfo(Variant::INT,"to_slot")));
 	ADD_SIGNAL(MethodInfo("disconnection_request",PropertyInfo(Variant::STRING,"from"),PropertyInfo(Variant::INT,"from_slot"),PropertyInfo(Variant::STRING,"to"),PropertyInfo(Variant::INT,"to_slot")));
-
+	ADD_SIGNAL(MethodInfo("popup_request", PropertyInfo(Variant::VECTOR2,"p_position")));
+	ADD_SIGNAL(MethodInfo("duplicate_nodes_request"));
+	ADD_SIGNAL(MethodInfo("delete_nodes_request"));
+	ADD_SIGNAL(MethodInfo("_begin_node_move"));
+	ADD_SIGNAL(MethodInfo("_end_node_move"));
 }
 
 
 
 GraphEdit::GraphEdit() {
+	set_focus_mode(FOCUS_ALL);
+
 	top_layer=NULL;
 	top_layer=memnew(GraphEditFilter(this));
 	add_child(top_layer);
@@ -581,6 +765,9 @@ GraphEdit::GraphEdit() {
 	connecting=false;
 	right_disconnects=false;
 
+	box_selecting = false;
+	dragging = false;
+
 	h_scroll->connect("value_changed", this,"_scroll_moved");
 	v_scroll->connect("value_changed", this,"_scroll_moved");
 }
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:
 
diff --git a/scene/gui/graph_node.cpp b/scene/gui/graph_node.cpp
index 444b37855f..5efc9757b7 100644
--- a/scene/gui/graph_node.cpp
+++ b/scene/gui/graph_node.cpp
@@ -40,7 +40,7 @@ bool GraphNode::_get(const StringName& p_name,Variant &r_ret) const{
 
 
 
-	if (!p_name.operator String().begins_with("slot/")) {		
+	if (!p_name.operator String().begins_with("slot/")) {
 		return false;
 	}
 
@@ -160,7 +160,7 @@ void GraphNode::_notification(int p_what) {
 
 	if (p_what==NOTIFICATION_DRAW) {
 
-		Ref<StyleBox> sb=get_stylebox("frame");
+		Ref<StyleBox> sb=get_stylebox(selected ? "selectedframe" : "frame");
 		Ref<Texture> port =get_icon("port");
 		Ref<Texture> close =get_icon("close");
 		int close_offset = get_constant("close_offset");
@@ -360,6 +360,29 @@ Vector2 GraphNode::get_offset() const {
 	return offset;
 }
 
+void GraphNode::set_selected(bool p_selected)
+{
+	selected = p_selected;
+	update();
+}
+
+bool GraphNode::is_selected()
+{
+	return selected;
+}
+
+void GraphNode::set_drag(bool p_drag)
+{
+	if (p_drag)
+		drag_from=get_offset();
+	else
+		emit_signal("dragged",drag_from,get_offset()); //useful for undo/redo
+}
+
+Vector2 GraphNode::get_drag_from()
+{
+	return drag_from;
+}
 
 
 void GraphNode::set_show_close_button(bool p_enable){
@@ -379,7 +402,6 @@ void GraphNode::_connpos_update() {
 	int sep=get_constant("separation");
 
 	Ref<StyleBox> sb=get_stylebox("frame");
-	Ref<Texture> port =get_icon("port");
 	conn_input_cache.clear();
 	conn_output_cache.clear();
 	int vofs=0;
@@ -503,31 +525,17 @@ Color GraphNode::get_connection_output_color(int p_idx) {
 
 void GraphNode::_input_event(const InputEvent& p_ev) {
 
-	if (p_ev.type==InputEvent::MOUSE_BUTTON && p_ev.mouse_button.pressed && p_ev.mouse_button.button_index==BUTTON_LEFT) {
+	if (p_ev.type==InputEvent::MOUSE_BUTTON) {
+		get_parent_control()->grab_focus();
+		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);
-		if (close_rect.size!=Size2() && close_rect.has_point(mpos)) {
-			emit_signal("close_request");
-			return;
+			Vector2 mpos = Vector2(p_ev.mouse_button.x,p_ev.mouse_button.y);
+			if (close_rect.size!=Size2() && close_rect.has_point(mpos)) {
+				emit_signal("close_request");
+				return;
+			}
+			emit_signal("raise_request");
 		}
-
-		drag_from=get_offset();
-		drag_accum=Vector2();
-		dragging=true;
-		emit_signal("raise_request");
-
-	}
-
-	if (p_ev.type==InputEvent::MOUSE_BUTTON && !p_ev.mouse_button.pressed && p_ev.mouse_button.button_index==BUTTON_LEFT) {
-
-		dragging=false;
-		emit_signal("dragged",drag_from,get_offset()); //useful for undo/redo
-	}
-
-	if (p_ev.type==InputEvent::MOUSE_MOTION && dragging) {
-
-		drag_accum+=Vector2(p_ev.mouse_motion.relative_x,p_ev.mouse_motion.relative_y);
-		set_offset(drag_from+drag_accum);
 	}
 
 }
@@ -576,8 +584,6 @@ void GraphNode::_bind_methods() {
 }
 
 GraphNode::GraphNode() {
-
-	dragging=false;
 	show_close=false;
 	connpos_dirty=true;
 }
diff --git a/scene/gui/graph_node.h b/scene/gui/graph_node.h
index 0d5cbf8dd3..201529380d 100644
--- a/scene/gui/graph_node.h
+++ b/scene/gui/graph_node.h
@@ -18,7 +18,7 @@ class GraphNode : public Container {
 		Color color_right;
 
 
-		Slot() { enable_left=false; type_left=0; color_left=Color(1,1,1,1); enable_right=false; type_right=0; color_right=Color(1,1,1,1); };
+		Slot() { enable_left=false; type_left=0; color_left=Color(1,1,1,1); enable_right=false; type_right=0; color_right=Color(1,1,1,1); }
 	};
 
 	String title;
@@ -46,8 +46,7 @@ class GraphNode : public Container {
 	void _resort();
 
 	Vector2 drag_from;
-	Vector2 drag_accum;
-	bool dragging;
+	bool selected;
 protected:
 
 	void _input_event(const InputEvent& p_ev);
@@ -79,6 +78,12 @@ public:
 	void set_offset(const Vector2& p_offset);
 	Vector2 get_offset() const;
 
+	void set_selected(bool p_selected);
+	bool is_selected();
+
+	void set_drag(bool p_drag);
+	Vector2 get_drag_from();
+
 	void set_show_close_button(bool p_enable);
 	bool is_close_button_visible() const;
 
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
index e639b5cb05..5df6f2ced9 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/tree.cpp
@@ -121,7 +121,7 @@ void TreeItem::set_cell_mode( int p_column, TreeCellMode p_mode ) {
 	c.val=0;
 	c.checked=false;
 	c.icon=Ref<Texture>();
-	c.text="";	
+	c.text="";
 	c.icon_max_w=0;
 	_changed_notify(p_column);
 }
@@ -153,9 +153,9 @@ void TreeItem::set_text(int p_column,String p_text) {
 
 	ERR_FAIL_INDEX( p_column, cells.size() );
 	cells[p_column].text=p_text;
-	
+
 	if (cells[p_column].mode==TreeItem::CELL_MODE_RANGE) {
-		
+
 		cells[p_column].min=0;
 		cells[p_column].max=p_text.get_slice_count(",");
 		cells[p_column].step=0;
@@ -225,7 +225,7 @@ void TreeItem::set_range(int p_column,double p_value) {
 		p_value=cells[p_column].min;
 	if (p_value>cells[p_column].max)
 		p_value=cells[p_column].max;
-	
+
 	cells[p_column].val=p_value;
 	_changed_notify(p_column);
 
@@ -237,7 +237,7 @@ double TreeItem::get_range(int p_column) const {
 	return cells[p_column].val;
 }
 
-		
+
 bool TreeItem::is_range_exponential(int p_column) const {
 
 	ERR_FAIL_INDEX_V( p_column, cells.size(), false);
@@ -304,7 +304,7 @@ void TreeItem::set_collapsed(bool p_collapsed) {
 
 			if (tree->select_mode==Tree::SELECT_MULTI) {
 
-				tree->selected_item=this;				
+				tree->selected_item=this;
 				emit_signal("cell_selected");
 			} else {
 
@@ -337,11 +337,11 @@ TreeItem *TreeItem::get_prev() {
 
 	if (!parent || parent->childs==this)
 		return NULL;
-	
+
 	TreeItem *prev = parent->childs;
 	while(prev && prev->next!=this)
 		prev=prev->next;
-	
+
 	return prev;
 }
 
@@ -636,14 +636,14 @@ void TreeItem::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_range","column"),&TreeItem::get_range);
 	ObjectTypeDB::bind_method(_MD("set_range_config","column","min","max","step","expr"),&TreeItem::set_range_config,DEFVAL(false));
 	ObjectTypeDB::bind_method(_MD("get_range_config","column"),&TreeItem::_get_range_config);
-	
+
 	ObjectTypeDB::bind_method(_MD("set_metadata","column","meta"),&TreeItem::set_metadata);
 	ObjectTypeDB::bind_method(_MD("get_metadata","column"),&TreeItem::get_metadata);
 
 	ObjectTypeDB::bind_method(_MD("set_custom_draw","column","object","callback"),&TreeItem::set_custom_draw);
 
 	ObjectTypeDB::bind_method(_MD("set_collapsed","enable"),&TreeItem::set_collapsed);
-	ObjectTypeDB::bind_method(_MD("is_collapsed"),&TreeItem::is_collapsed);	
+	ObjectTypeDB::bind_method(_MD("is_collapsed"),&TreeItem::is_collapsed);
 
 	ObjectTypeDB::bind_method(_MD("get_next:TreeItem"),&TreeItem::get_next);
 	ObjectTypeDB::bind_method(_MD("get_prev:TreeItem"),&TreeItem::get_prev);
@@ -654,17 +654,17 @@ void TreeItem::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_prev_visible:TreeItem"),&TreeItem::get_prev_visible);
 
 	ObjectTypeDB::bind_method(_MD("remove_child:TreeItem","child"),&TreeItem::_remove_child);
-	
+
 	ObjectTypeDB::bind_method(_MD("set_selectable","column","selectable"),&TreeItem::set_selectable);
 	ObjectTypeDB::bind_method(_MD("is_selectable","column"),&TreeItem::is_selectable);
 
 	ObjectTypeDB::bind_method(_MD("is_selected","column"),&TreeItem::is_selected);
 	ObjectTypeDB::bind_method(_MD("select","column"),&TreeItem::select);
 	ObjectTypeDB::bind_method(_MD("deselect","column"),&TreeItem::deselect);
-	
+
 	ObjectTypeDB::bind_method(_MD("set_editable","column","enabled"),&TreeItem::set_editable);
 	ObjectTypeDB::bind_method(_MD("is_editable","column"),&TreeItem::is_editable);
-	
+
 	ObjectTypeDB::bind_method(_MD("set_custom_color","column","color"),&TreeItem::set_custom_color);
 	ObjectTypeDB::bind_method(_MD("clear_custom_color","column"),&TreeItem::clear_custom_color);
 
@@ -688,7 +688,7 @@ void TreeItem::_bind_methods() {
 	BIND_CONSTANT( CELL_MODE_RANGE );
 	BIND_CONSTANT( CELL_MODE_ICON );
 	BIND_CONSTANT( CELL_MODE_CUSTOM );
-			
+
 
 }
 
@@ -774,7 +774,7 @@ void Tree::update_cache() {
 	cache.arrow =get_icon("arrow");
 	cache.select_arrow =get_icon("select_arrow");
 	cache.updown=get_icon("updown");
-	
+
 	cache.font_color=get_color("font_color");
 	cache.font_color_selected=get_color("font_color_selected");
 	cache.guide_color=get_color("guide_color");
@@ -802,10 +802,10 @@ int Tree::compute_item_height(TreeItem *p_item) const {
 
 	if (p_item==root && hide_root)
 		return 0;
-		
+
 	int height=cache.font->get_height();
 
-	
+
 	for (int i=0;i<columns.size();i++) {
 
 
@@ -819,23 +819,23 @@ int Tree::compute_item_height(TreeItem *p_item) const {
 		}
 
 		switch(p_item->cells[i].mode) {
-	
+
 			case TreeItem::CELL_MODE_CHECK: {
-	
+
 				int check_icon_h = cache.checked->get_height();
 				if (height<check_icon_h)
 					height=check_icon_h;
-	
-	
-	
+
+
+
 			}
 			case TreeItem::CELL_MODE_STRING:
 			case TreeItem::CELL_MODE_CUSTOM:
 			case TreeItem::CELL_MODE_ICON: {
-	
+
 				Ref<Texture> icon = p_item->cells[i].icon;
 				if (!icon.is_null()) {
-	
+
 					Size2i s = p_item->cells[i].get_icon_size();
 					if (p_item->cells[i].icon_max_w>0 && s.width > p_item->cells[i].icon_max_w ) {
 						s.height=s.height * p_item->cells[i].icon_max_w / s.width;
@@ -843,15 +843,15 @@ int Tree::compute_item_height(TreeItem *p_item) const {
 					if (s.height > height )
 						height=s.height;
 				}
-	
+
 			} break;
 			default: {}
 		}
 	}
-	
-	
+
+
 	height += cache.vseparation;
-	
+
 	return height;
 
 }
@@ -927,7 +927,7 @@ void Tree::draw_item_text(String p_text,const Ref<Texture>& p_icon,int p_icon_ma
 		p_rect.size.x-=Math::floor(p_rect.size.y/2);
 
 	Ref<Font> font = cache.font;
-	
+
 	p_rect.pos.y+=Math::floor((p_rect.size.y-font->get_height())/2.0) +font->get_ascent();
 	font->draw(ci,p_rect.pos,p_text,p_color,p_rect.size.x);
 }
@@ -950,13 +950,13 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2&
 
 	Point2i guide_from;
 
-    	bool skip=(p_item==root && hide_root);
+		bool skip=(p_item==root && hide_root);
    // printf("skip (%p == %p && %i) %i\n",p_item,root,hide_root,skip);
 
 
 	if (!skip && (p_pos.y+label_h-cache.offset.y)>0) {
 
-      //  printf("entering\n");
+	  //  printf("entering\n");
 
 		int height=label_h;
 
@@ -965,7 +965,7 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2&
 		if (p_item->childs) { //has childs, draw the guide box
 
 			Ref<Texture> arrow;
-			
+
 			if (p_item->collapsed) {
 
 				arrow=cache.arrow_collapsed;
@@ -983,7 +983,7 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2&
 //		if (p_item->get_parent()!=root || !hide_root)
 
 		Ref<Font> font = cache.font;
-		
+
 		int font_ascent=font->get_ascent();
 
 		int ofs = p_pos.x + cache.item_margin;
@@ -1066,7 +1066,7 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2&
 			}
 
 			Color col=p_item->cells[i].custom_color?p_item->cells[i].color:get_color( p_item->cells[i].selected?"font_color_selected":"font_color");
-			
+
 			Point2i text_pos=item_rect.pos;
 			text_pos.y+=Math::floor((item_rect.size.y-font->get_height())/2) + font_ascent;
 
@@ -1104,7 +1104,7 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2&
 
 				} break;
 				case TreeItem::CELL_MODE_RANGE: {
-						
+
 					if (p_item->cells[i].text!="") {
 
 						if (!p_item->cells[i].editable)
@@ -1128,7 +1128,7 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2&
 					} else {
 
 						Ref<Texture> updown = cache.updown;
-					
+
 						String valtext = String::num( p_item->cells[i].val, Math::decimals( p_item->cells[i].step ) );
 						font->draw( ci, text_pos, valtext, col, item_rect.size.x-updown->get_width());
 
@@ -1185,7 +1185,7 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2&
 					Rect2i ir=item_rect;
 					ir.size.width-=downarrow->get_width();
 					draw_item_rect(p_item->cells[i],ir,col);
-					
+
 					Point2i arrow_pos=item_rect.pos;
 					arrow_pos.x+=item_rect.size.x-downarrow->get_width();
 					arrow_pos.y+=Math::floor(((item_rect.size.y-downarrow->get_height()))/2.0);
@@ -1227,7 +1227,7 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2&
 		children_pos.x+=cache.item_margin;
 		htotal+=label_h;
 		children_pos.y+=htotal;
-     	   
+
 	}
 
 
@@ -1272,12 +1272,12 @@ void Tree::select_single_item(TreeItem *p_selected,TreeItem *p_current,int p_col
 			continue;
 
 		if (select_mode==SELECT_ROW) {
-	
+
 
 			if (p_selected==p_current) {
-	
+
 				if (!c.selected) {
-		
+
 					c.selected=true;
 					selected_item=p_selected;
 					selected_col=0;
@@ -1286,26 +1286,26 @@ void Tree::select_single_item(TreeItem *p_selected,TreeItem *p_current,int p_col
 					//if (p_col==i)
 					//	p_current->selected_signal.call(p_col);
 				}
-		
+
 			} else {
-		
+
 				if (c.selected) {
-		
-					c.selected=false;					
+
+					c.selected=false;
 					//p_current->deselected_signal.call(p_col);
 				}
-	
+
 			}
-	
+
 		} else if (select_mode==SELECT_SINGLE || select_mode==SELECT_MULTI) {
-	
+
 			if (!r_in_range && &selected_cell==&c) {
-		
+
 
 				if (!selected_cell.selected) {
-		
+
 					selected_cell.selected=true;
-					
+
 					selected_item=p_selected;
 					selected_col=i;
 
@@ -1321,7 +1321,7 @@ void Tree::select_single_item(TreeItem *p_selected,TreeItem *p_current,int p_col
 
 				}
 			} else {
-			
+
 
 				if (r_in_range && *r_in_range) {
 
@@ -1372,7 +1372,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
 	int item_h=compute_item_height( p_item )+cache.vseparation;
 
 	bool skip=(p_item==root && hide_root);
-	
+
 	if (!skip && p_pos.y<item_h) {
 		// check event!
 
@@ -1384,7 +1384,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
 
 			return -1; //handled!
 		}
-		
+
 		int x=p_pos.x;
 		/* find clicked column */
 		int col=-1;
@@ -1403,7 +1403,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
 			break;
 		}
 
-		
+
 
 		if (col==-1)
 			return -1;
@@ -1487,8 +1487,8 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
 					//}
 					update();
 				}
-				
-				
+
+
 			}
 		}
 
@@ -1514,14 +1514,14 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
 
 			} break;
 			case TreeItem::CELL_MODE_CHECK: {
-				
+
 				Ref<Texture> checked = cache.checked;
 				bring_up_editor=false; //checkboxes are not edited with editor
 				if (x>=0 && x<= checked->get_width()+cache.hseparation ) {
 
-					
+
 					p_item->set_checked(col,!c.checked);
-					item_edited(col,p_item); 
+					item_edited(col,p_item);
 					click_handled=true;
 					//p_item->edited_signal.call(col);
 				}
@@ -1549,37 +1549,37 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
 					//}
 					bring_up_editor=false;
 				} else {
-					
+
 					Ref<Texture> updown = cache.updown;
-					
-					
+
+
 					if (x >= (col_width-item_h/2)) {
-					
+
 						/* touching the combo */
 						bool up=p_pos.y < (item_h /2);
-						
+
 						if (p_button==BUTTON_LEFT) {
 							p_item->set_range( col, c.val + (up?1.0:-1.0) * c.step );
-						
-							item_edited(col,p_item); 	
+
+							item_edited(col,p_item);
 						} else if (p_button==BUTTON_RIGHT) {
-	
+
 							p_item->set_range( col, (up?c.max:c.min) );
-							item_edited(col,p_item); 
+							item_edited(col,p_item);
 						} else if (p_button==BUTTON_WHEEL_UP) {
-	
+
 							p_item->set_range( col, c.val + c.step );
-							item_edited(col,p_item); 
+							item_edited(col,p_item);
 						} else if (p_button==BUTTON_WHEEL_DOWN) {
-	
+
 							p_item->set_range( col, c.val - c.step );
-							item_edited(col,p_item); 
+							item_edited(col,p_item);
 						}
-	
-						//p_item->edited_signal.call(col);	
+
+						//p_item->edited_signal.call(col);
 						bring_up_editor=false;
-						
-						
+
+
 					}  else {
 
 						editor_text=String::num( p_item->cells[col].val, Math::decimals( p_item->cells[col].step ) );
@@ -1587,7 +1587,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
 						if (select_mode==SELECT_MULTI && get_tree()->get_last_event_id() == focus_in_id)
 							bring_up_editor=false;
 
-					}	
+					}
 
 				}
 				click_handled=true;
@@ -1598,12 +1598,12 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
 			} break;
 			case TreeItem::CELL_MODE_CUSTOM: {
 				edited_item=p_item;
-				edited_col=col;					
+				edited_col=col;
 				custom_popup_rect=Rect2i(get_global_pos() + Point2i(col_ofs,_get_title_button_height()+y_ofs+item_h-cache.offset.y), Size2(get_column_width(col),item_h));
 				emit_signal("custom_popup_edited",((bool)(x >= (col_width-item_h/2))));
 
 				bring_up_editor=false;
-				item_edited(col,p_item); 
+				item_edited(col,p_item);
 				click_handled=true;
 				return -1;
 			} break;
@@ -1615,7 +1615,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
 
 
 
-		click_handled=true;		
+		click_handled=true;
 		popup_edited_item=p_item;
 		popup_edited_item_col=col;
 
@@ -1627,14 +1627,14 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
 	} else {
 
 		Point2i new_pos=p_pos;
-		
+
 		if (!skip) {
 			x_ofs+=cache.item_margin;
 			//new_pos.x-=cache.item_margin;
 			y_ofs+=item_h;
 			new_pos.y-=item_h;
 		}
-		
+
 
 		if (!p_item->collapsed) { /* if not collapsed, check the childs */
 
@@ -1697,7 +1697,7 @@ void Tree::text_editor_enter(String p_text) {
 	default: { ERR_FAIL(); }
 	}
 
-	item_edited(popup_edited_item_col,popup_edited_item);	
+	item_edited(popup_edited_item_col,popup_edited_item);
 	update();
 
 }
@@ -1725,19 +1725,19 @@ void Tree::popup_select(int p_option) {
 	if (popup_edited_item_col<0 || popup_edited_item_col>columns.size())
 		return;
 
-	
+
 	popup_edited_item->cells[popup_edited_item_col].val=p_option;
 	//popup_edited_item->edited_signal.call( popup_edited_item_col );
 	update();
-	item_edited(popup_edited_item_col,popup_edited_item);	
+	item_edited(popup_edited_item_col,popup_edited_item);
 }
 
 
 
 void Tree::_input_event(InputEvent p_event) {
-	
+
 	switch (p_event.type) {
-		
+
 		case InputEvent::KEY: {
 
 			if (!p_event.key.pressed)
@@ -2091,12 +2091,12 @@ void Tree::_input_event(InputEvent p_event) {
 			}
 		} break;
 		case InputEvent::MOUSE_BUTTON: {
-			
+
 
 
 			if (cache.font.is_null()) // avoid a strange case that may fuckup stuff
 				update_cache();
-			const InputEventMouseButton& b=p_event.mouse_button;			
+			const InputEventMouseButton& b=p_event.mouse_button;
 
 
 			if (!b.pressed) {
@@ -2160,7 +2160,7 @@ void Tree::_input_event(InputEvent p_event) {
 			switch(b.button_index) {
 				case BUTTON_LEFT: {
 					Ref<StyleBox> bg = cache.bg;
-					
+
 					Point2 pos = Point2(b.x,b.y) - bg->get_offset();
 					cache.click_type=Cache::CLICK_NONE;
 					if (show_column_titles) {
@@ -2222,18 +2222,18 @@ void Tree::_input_event(InputEvent p_event) {
 
 
 				} break;
-				case BUTTON_WHEEL_UP: {				
+				case BUTTON_WHEEL_UP: {
 					v_scroll->set_val( v_scroll->get_val()-v_scroll->get_page()/8 );
 				} break;
 				case BUTTON_WHEEL_DOWN: {
-				
+
 					v_scroll->set_val( v_scroll->get_val()+v_scroll->get_page()/8 );
 				} break;
 			}
-				
+
 		} break;
 	}
-	
+
 }
 
 
@@ -2331,10 +2331,10 @@ Size2 Tree::get_internal_min_size() const {
 	if (root)
 		size.height+=get_item_height(root);
 	for (int i=0;i<columns.size();i++) {
-	
+
 		size.width+=columns[i].min_width;
 	}
-	
+
 	return size;
 }
 
@@ -2353,39 +2353,39 @@ void Tree::update_scrollbars() {
 	Size2 vmin = v_scroll->get_combined_minimum_size();
 
 
-	
+
 	v_scroll->set_begin( Point2(size.width - vmin.width , cache.bg->get_margin(MARGIN_TOP)) );
 	v_scroll->set_end( Point2(size.width, size.height-cache.bg->get_margin(MARGIN_TOP)-cache.bg->get_margin(MARGIN_BOTTOM)) );
-	
+
 	h_scroll->set_begin( Point2( 0, size.height - hmin.height) );
 	h_scroll->set_end( Point2(size.width-vmin.width, size.height) );
-	
-	
+
+
 	Size2 min = get_internal_min_size();
-	
+
 	if (min.height < size.height - hmin.height) {
-	
+
 		v_scroll->hide();
 		cache.offset.y=0;
 	} else {
-	
+
 		v_scroll->show();
 		v_scroll->set_max(min.height);
 		v_scroll->set_page(size.height - hmin.height - tbh);
 		cache.offset.y=v_scroll->get_val();
 	}
-	
+
 	if (min.width < size.width - vmin.width) {
-	
+
 		h_scroll->hide();
 		cache.offset.x=0;
 	} else {
-	
+
 		h_scroll->show();
 		h_scroll->set_max(min.width);
 		h_scroll->set_page(size.width - vmin.width);
 		cache.offset.x=h_scroll->get_val();
-	}	
+	}
 }
 
 
@@ -2464,16 +2464,16 @@ void Tree::_notification(int p_what) {
 	}
 
 	if (p_what==NOTIFICATION_DRAW) {
-	
+
 		update_cache();
 		update_scrollbars();
-		RID ci = get_canvas_item();	
-		
+		RID ci = get_canvas_item();
+
 		VisualServer::get_singleton()->canvas_item_set_clip(ci,true);
-		
+
 		Ref<StyleBox> bg = cache.bg;
 		Ref<StyleBox> bg_focus = get_stylebox("bg_focus");
-						
+
 		Point2 draw_ofs;
 		draw_ofs+=bg->get_offset();
 		Size2 draw_size=get_size()-bg->get_minimum_size();
@@ -2491,7 +2491,7 @@ void Tree::_notification(int p_what) {
 		draw_size.y-=tbh;
 
 		if (root) {
-		
+
 
 			draw_item( Point2(),draw_ofs,draw_size,root);
 
@@ -2502,10 +2502,10 @@ void Tree::_notification(int p_what) {
 //		int size_y=exposed.size.height-bg->get_minimum_size().height;
 
 		for (int i=0;i<(columns.size()-1-1);i++) {
-			
+
 			ofs+=get_column_width(i);
 			//get_painter()->draw_fill_rect( Point2(ofs+cache.hseparation/2, from_y), Size2( 1, size_y ),color( COLOR_TREE_GRID) );
-		}	
+		}
 
 		if (show_column_titles) {
 
@@ -2605,7 +2605,7 @@ TreeItem* Tree::get_last_item() {
 }
 
 void Tree::item_edited(int p_column,TreeItem *p_item) {
-	
+
 	edited_item=p_item;
 	edited_col=p_column;
 	emit_signal("item_edited");
@@ -2613,14 +2613,14 @@ void Tree::item_edited(int p_column,TreeItem *p_item) {
 
 void Tree::item_changed(int p_column,TreeItem *p_item) {
 
-	update(); 
+	update();
 }
 
 void Tree::item_selected(int p_column,TreeItem *p_item) {
 
 
 	if (select_mode==SELECT_MULTI) {
-		
+
 		if (!p_item->cells[p_column].selectable)
 			return;
 
@@ -2636,16 +2636,16 @@ void Tree::item_selected(int p_column,TreeItem *p_item) {
 void Tree::item_deselected(int p_column,TreeItem *p_item) {
 
 	if (select_mode==SELECT_MULTI) {
-		
+
 		p_item->cells[p_column].selected=false;
-	} 
+	}
 	update();
 }
 
 
 void Tree::set_select_mode(SelectMode p_mode) {
 
-    select_mode=p_mode;
+	select_mode=p_mode;
 }
 
 void Tree::clear() {
@@ -2675,15 +2675,15 @@ void Tree::set_hide_root(bool p_enabled) {
 
 
 
-    hide_root=p_enabled;
-    update();
+	hide_root=p_enabled;
+	update();
 }
 
 void Tree::set_column_min_width(int p_column,int p_min_width) {
 
 
 	ERR_FAIL_INDEX(p_column,columns.size());
-	
+
 	if (p_min_width<1)
 		return;
 	columns[p_column].min_width=p_min_width;
@@ -2693,8 +2693,8 @@ void Tree::set_column_min_width(int p_column,int p_min_width) {
 void Tree::set_column_expand(int p_column,bool p_expand) {
 
 	ERR_FAIL_INDEX(p_column,columns.size());
-	
- 	columns[p_column].expand=p_expand;
+
+	columns[p_column].expand=p_expand;
 	update();
 }
 
@@ -2709,78 +2709,78 @@ int Tree::get_selected_column() const {
 }
 
 TreeItem *Tree::get_edited() const {
-	
+
 	return edited_item;
 }
 
 int Tree::get_edited_column() const {
-	
+
 	return edited_col;
 }
 
 TreeItem* Tree::get_next_selected( TreeItem* p_item) {
-	
+
 	//if (!p_item)
 	//	return NULL;
 	if (!root)
-		return NULL;				
-	
+		return NULL;
+
 	while(true) {
-	
-		
+
+
 		if (!p_item) {
 			p_item=root;
 		} else {
-				
+
 			if (p_item->childs) {
-				
+
 				p_item=p_item->childs;
-				
+
 			} else if (p_item->next) {
-			
-				p_item=p_item->next;			
+
+				p_item=p_item->next;
 			} else {
-			
+
 				while(!p_item->next) {
-			
+
 					p_item=p_item->parent;
 					if (p_item==NULL)
 						return NULL;
 				}
-				
+
 				p_item=p_item->next;
 			}
-			
+
 		}
-	
+
 		for (int i=0;i<columns.size();i++)
 			if (p_item->cells[i].selected)
 				return p_item;
 	}
-	
+
 	return NULL;
 }
 
 int Tree::get_column_width(int p_column) const {
-	
+
 	ERR_FAIL_INDEX_V(p_column,columns.size(),-1);
-	
-	
+
+
 	if (!columns[p_column].expand)
 		return columns[p_column].min_width;
-	
+
 	Ref<StyleBox> bg = cache.bg;
-	
+
 	int expand_area=get_size().width-(bg->get_margin(MARGIN_LEFT)+bg->get_margin(MARGIN_RIGHT));
-	
+
 	if (v_scroll->is_visible())
 		expand_area-=v_scroll->get_combined_minimum_size().width;
-	
+
 	int expanding_columns=0;
 	int expanding_total=0;
-	
+
 	for (int i=0;i<columns.size();i++) {
-		
+
 		if (!columns[i].expand) {
 			expand_area-=columns[i].min_width;
 		} else {
@@ -2791,30 +2791,30 @@ int Tree::get_column_width(int p_column) const {
 
 	if (expand_area<expanding_total)
 		return columns[p_column].min_width;
-	
+
 	ERR_FAIL_COND_V(expanding_columns==0,-1); // shouldnt happen
-	
+
 	return expand_area * columns[p_column].min_width / expanding_total;
 }
 
 void Tree::propagate_set_columns(TreeItem *p_item) {
-	
+
 	p_item->cells.resize( columns.size() );
-	
+
 	TreeItem *c = p_item->get_children();
 	while(c) {
-		
+
 		propagate_set_columns(c);
 		c=c->get_next();
 	}
 }
 
 void Tree::set_columns(int p_columns) {
-	
+
 	ERR_FAIL_COND(p_columns<1);
 	ERR_FAIL_COND(blocked>0);
 	columns.resize(p_columns);
-	
+
 	if (root)
 		propagate_set_columns(root);
 	if (selected_col>=p_columns)
@@ -2824,17 +2824,17 @@ void Tree::set_columns(int p_columns) {
 }
 
 int Tree::get_columns() const {
-	
+
 	return columns.size();
 }
 
 void Tree::_scroll_moved(float) {
-	
+
 	update();
 }
 
 Rect2 Tree::get_custom_popup_rect() const {
-	
+
 	return custom_popup_rect;
 }
 
@@ -3116,7 +3116,7 @@ bool Tree::can_cursor_exit_tree() const {
 
 
 void Tree::_bind_methods() {
-	
+
 	ObjectTypeDB::bind_method(_MD("_input_event"),&Tree::_input_event);
 	ObjectTypeDB::bind_method(_MD("_popup_select"),&Tree::popup_select);
 	ObjectTypeDB::bind_method(_MD("_text_editor_enter"),&Tree::text_editor_enter);
@@ -3140,7 +3140,7 @@ void Tree::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("set_columns","amount"),&Tree::set_columns);
 	ObjectTypeDB::bind_method(_MD("get_columns"),&Tree::get_columns);
-	
+
 	ObjectTypeDB::bind_method(_MD("get_edited:TreeItem"),&Tree::get_edited);
 	ObjectTypeDB::bind_method(_MD("get_edited_column"),&Tree::get_edited_column);
 	ObjectTypeDB::bind_method(_MD("get_custom_popup_rect"),&Tree::get_custom_popup_rect);
@@ -3179,7 +3179,7 @@ Tree::Tree() {
 	edited_item=NULL;
 	selected_col=-1;
 	edited_col=-1;
-	
+
 	hide_root=false;
 	select_mode=SELECT_SINGLE;
 	root=0;
@@ -3187,8 +3187,8 @@ Tree::Tree() {
 	popup_edited_item=NULL;
 	text_editor=NULL;
 	set_focus_mode(FOCUS_ALL);
-	
-		
+
+
 	popup_menu = memnew( PopupMenu );
 	popup_menu->hide();
 	add_child(popup_menu);
@@ -3204,7 +3204,7 @@ Tree::Tree() {
 
 	h_scroll = memnew( HScrollBar );
 	v_scroll = memnew( VScrollBar );
-	
+
 	add_child(h_scroll);
 	add_child(v_scroll);
 
@@ -3250,6 +3250,6 @@ Tree::~Tree() {
 	if (root) {
 		memdelete( root );
 	}
-	
+
 }