-begun implementing drag & drop editor wide

-filesystem dock dnd support
-property list dnd support
-scene tree dnd support

9 files changed, 322 insertions, 20 deletions

diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp
index 6a251a5ac5..64f1de42af 100644
--- a/scene/gui/item_list.cpp
+++ b/scene/gui/item_list.cpp
@@ -1044,8 +1044,7 @@ void ItemList::_scroll_changed(double) {
 	update();
 }
 
-
-String ItemList::get_tooltip(const Point2& p_pos) const {
+int ItemList::get_item_at_pos(const Point2& p_pos) const {
 
 	Vector2 pos=p_pos;
 	Ref<StyleBox> bg = get_stylebox("bg");
@@ -1074,6 +1073,13 @@ String ItemList::get_tooltip(const Point2& p_pos) const {
 		}
 	}
 
+	return closest;
+}
+
+String ItemList::get_tooltip(const Point2& p_pos) const {
+
+	int closest = get_item_at_pos(p_pos);
+
 	if (closest!=-1) {
 		if (items[closest].tooltip!="") {
 			return items[closest].tooltip;
@@ -1084,8 +1090,6 @@ String ItemList::get_tooltip(const Point2& p_pos) const {
 	}
 
 	return Control::get_tooltip(p_pos);
-
-
 }
 
 void ItemList::sort_items_by_text() {
@@ -1170,6 +1174,8 @@ void ItemList::_bind_methods(){
 	ObjectTypeDB::bind_method(_MD("set_min_icon_size","size"),&ItemList::set_min_icon_size);
 	ObjectTypeDB::bind_method(_MD("get_min_icon_size"),&ItemList::get_min_icon_size);
 
+	ObjectTypeDB::bind_method(_MD("get_item_at_pos","pos"),&ItemList::get_item_at_pos);
+
 	ObjectTypeDB::bind_method(_MD("ensure_current_is_visible"),&ItemList::ensure_current_is_visible);
 
 	ObjectTypeDB::bind_method(_MD("_scroll_changed"),&ItemList::_scroll_changed);
diff --git a/scene/gui/item_list.h b/scene/gui/item_list.h
index 5aec946686..fcb4dfae5a 100644
--- a/scene/gui/item_list.h
+++ b/scene/gui/item_list.h
@@ -140,6 +140,7 @@ public:
 	int find_metadata(const Variant& p_metadata) const;
 
 	virtual String get_tooltip(const Point2& p_pos) const;
+	int get_item_at_pos(const Point2& p_pos) const;
 
 	ItemList();
 	~ItemList();
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
index c4efe82eaa..c141635bbf 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/tree.cpp
@@ -604,10 +604,11 @@ String TreeItem::get_tooltip(int p_column) const{
 	return cells[p_column].tooltip;
 }
 
-void TreeItem::set_custom_bg_color(int p_column,const Color& p_color) {
+void TreeItem::set_custom_bg_color(int p_column,const Color& p_color,bool p_bg_outline) {
 
 	ERR_FAIL_INDEX( p_column, cells.size() );
 	cells[p_column].custom_bg_color=true;
+	cells[p_column].custom_bg_outline=p_bg_outline;
 	cells[p_column].bg_color=p_color;
 	_changed_notify(p_column);
 }
@@ -685,7 +686,7 @@ void TreeItem::_bind_methods() {
 	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);
 
-	ObjectTypeDB::bind_method(_MD("set_custom_bg_color","column","color"),&TreeItem::set_custom_bg_color);
+	ObjectTypeDB::bind_method(_MD("set_custom_bg_color","column","color","just_outline"),&TreeItem::set_custom_bg_color,DEFVAL(false));
 	ObjectTypeDB::bind_method(_MD("clear_custom_bg_color","column"),&TreeItem::clear_custom_bg_color);
 	ObjectTypeDB::bind_method(_MD("get_custom_bg_color","column"),&TreeItem::get_custom_bg_color);
 
@@ -757,6 +758,13 @@ TreeItem::~TreeItem() {
 	if (tree && tree->selected_item==this)
 		tree->selected_item=NULL;
 
+
+	if (tree && tree->drop_mode_over==this)
+		tree->drop_mode_over=NULL;
+
+	if (tree && tree->single_select_defer==this)
+		tree->single_select_defer=NULL;
+
 	if (tree && tree->edited_item==this) {
 		tree->edited_item=NULL;
 		tree->pressing_for_editor=false;
@@ -797,17 +805,13 @@ void Tree::update_cache() {
 	cache.font_color=get_color("font_color");
 	cache.font_color_selected=get_color("font_color_selected");
 	cache.guide_color=get_color("guide_color");
+	cache.drop_position_color=get_color("drop_position_color");
 	cache.hseparation=get_constant("hseparation");
 	cache.vseparation=get_constant("vseparation");
 	cache.item_margin=get_constant("item_margin");
 	cache.button_margin=get_constant("button_margin");
 	cache.guide_width=get_constant("guide_width");
 
-	Ref<StyleBox> title_button;
-	Ref<StyleBox> title_button_hover;
-	Ref<StyleBox> title_button_pressed;
-	Color title_button_color;
-
 	cache.title_button = get_stylebox("title_button_normal");
 	cache.title_button_pressed = get_stylebox("title_button_pressed");
 	cache.title_button_hover = get_stylebox("title_button_hover");
@@ -1087,7 +1091,34 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2&
 				Rect2 r=cell_rect;
 				r.pos.x-=cache.hseparation;
 				r.size.x+=cache.hseparation;
-				VisualServer::get_singleton()->canvas_item_add_rect(ci,r,p_item->cells[i].bg_color);
+				if (p_item->cells[i].custom_bg_outline) {
+					VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(r.pos.x,r.pos.y,r.size.x,1),p_item->cells[i].bg_color);
+					VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(r.pos.x,r.pos.y+r.size.y-1,r.size.x,1),p_item->cells[i].bg_color);
+					VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(r.pos.x,r.pos.y,1,r.size.y),p_item->cells[i].bg_color);
+					VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(r.pos.x+r.size.x-1,r.pos.y,1,r.size.y),p_item->cells[i].bg_color);
+				} else {
+					VisualServer::get_singleton()->canvas_item_add_rect(ci,r,p_item->cells[i].bg_color);
+				}
+			}
+
+			if (drop_mode_flags && drop_mode_over==p_item) {
+
+				Rect2 r=cell_rect;
+
+				if (drop_mode_section==-1 || drop_mode_section==0) {
+					VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(r.pos.x,r.pos.y,r.size.x,1),cache.drop_position_color);
+
+				}
+
+				if (drop_mode_section==0) {
+					VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(r.pos.x,r.pos.y,1,r.size.y),cache.drop_position_color);
+					VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(r.pos.x+r.size.x-1,r.pos.y,1,r.size.y),cache.drop_position_color);
+
+				}
+
+				if (drop_mode_section==1 || drop_mode_section==0) {
+					VisualServer::get_singleton()->canvas_item_add_rect(ci,Rect2(r.pos.x,r.pos.y+r.size.y,r.size.x,1),cache.drop_position_color);
+				}
 			}
 
 			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");
@@ -1280,6 +1311,25 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2&
 
 }
 
+int Tree::_count_selected_items(TreeItem* p_from) const {
+
+	int count=0;
+	for(int i=0;i<columns.size();i++) {
+		if (p_from->is_selected(i))
+			count++;
+	}
+
+	if (p_from->get_children()) {
+		count+=_count_selected_items(p_from->get_children());
+	}
+
+	if (p_from->get_next()) {
+		count+=_count_selected_items(p_from->get_next());
+	}
+
+	return count;
+
+}
 void Tree::select_single_item(TreeItem *p_selected,TreeItem *p_current,int p_col,TreeItem *p_prev,bool *r_in_range) {
 
 	TreeItem::Cell &selected_cell=p_selected->cells[p_col];
@@ -1548,7 +1598,15 @@ int Tree::propagate_mouse_event(const Point2i &p_pos,int x_ofs,int y_ofs,bool p_
 
 						select_single_item( p_item, root, col,selected_item,&inrange );
 					} else {
-						select_single_item( p_item, root, col );
+
+						int icount = _count_selected_items(root);
+
+						if (select_mode==SELECT_MULTI && icount>1) {
+							single_select_defer=p_item;
+							single_select_defer_column=col;
+						} else {
+							select_single_item( p_item, root, col );
+						}
 					}
 
 					//if (!c.selected && select_mode==SELECT_MULTI) {
@@ -2159,6 +2217,31 @@ void Tree::_input_event(InputEvent p_event) {
 
 			}
 
+			if (drop_mode_flags && root) {
+
+				Point2 mpos=Point2(b.x,b.y);
+				mpos -= cache.bg->get_offset();
+				mpos.y-=_get_title_button_height();
+				if (mpos.y>=0) {
+
+					if (h_scroll->is_visible())
+						mpos.x+=h_scroll->get_val();
+					if (v_scroll->is_visible())
+						mpos.y+=v_scroll->get_val();
+
+					int col,h,section;
+					TreeItem *it = _find_item_at_pos(root,mpos,col,h,section);
+
+					if (it!=drop_mode_over || section!=drop_mode_section) {
+						drop_mode_over=it;
+						drop_mode_section=section;
+						update();
+					}
+				}
+			}
+
+
+
 			if (cache.hover_type!=old_hover || cache.hover_index!=old_index) {
 				update();
 			}
@@ -2211,6 +2294,12 @@ void Tree::_input_event(InputEvent p_event) {
 
 				if (b.button_index==BUTTON_LEFT) {
 
+
+					if (single_select_defer) {
+						select_single_item( single_select_defer, root, single_select_defer_column );
+						single_select_defer=NULL;
+					}
+
 					range_click_timer->stop();
 
 					if (pressing_for_editor) {
@@ -2522,6 +2611,15 @@ void Tree::_notification(int p_what) {
 
 		update_cache();;
 	}
+	if (p_what==NOTIFICATION_DRAG_END) {
+
+		drop_mode_flags=0;
+		update();
+	}
+	if (p_what==NOTIFICATION_DRAG_BEGIN) {
+
+		single_select_defer=NULL;
+	}
 	if (p_what==NOTIFICATION_FIXED_PROCESS) {
 
 		if (drag_touching)  {
@@ -3135,7 +3233,7 @@ void Tree::_do_incr_search(const String& p_add) {
 
 }
 
-TreeItem* Tree::_find_item_at_pos(TreeItem*p_item, const Point2& p_pos,int& r_column,int &h) const {
+TreeItem* Tree::_find_item_at_pos(TreeItem*p_item, const Point2& p_pos,int& r_column,int &h,int &section) const {
 
 	Point2 pos = p_pos;
 
@@ -3145,15 +3243,33 @@ TreeItem* Tree::_find_item_at_pos(TreeItem*p_item, const Point2& p_pos,int& r_co
 		h = compute_item_height(p_item)+cache.vseparation;;
 		if (pos.y<h) {
 
+			if (drop_mode_flags==DROP_MODE_ON_ITEM) {
+				section=0;
+			} else if (drop_mode_flags==DROP_MODE_INBETWEEN) {
+				section=pos.y<h/2?-1:1;
+			} else if (pos.y<h/4) {
+				section=-1;
+			} else if (pos.y>=(h*3/4)) {
+				section=1;
+			} else {
+				section=0;
+			}
+
 			for(int i=0;i<columns.size();i++) {
 
 				int w = get_column_width(i);
 				if (pos.x < w) {
 					r_column=i;
+
+
 					return p_item;
 				}
 				pos.x-=w;
 			}
+
+
+
+
 			return NULL;
 		} else {
 
@@ -3172,7 +3288,7 @@ TreeItem* Tree::_find_item_at_pos(TreeItem*p_item, const Point2& p_pos,int& r_co
 
 
 		int ch;
-		TreeItem *r = _find_item_at_pos(n,pos,r_column,ch);
+		TreeItem *r = _find_item_at_pos(n,pos,r_column,ch,section);
 		pos.y-=ch;
 		h+=ch;
 		if (r)
@@ -3184,6 +3300,88 @@ TreeItem* Tree::_find_item_at_pos(TreeItem*p_item, const Point2& p_pos,int& r_co
 
 }
 
+int Tree::get_column_at_pos(const Point2& p_pos) const {
+
+	if (root) {
+
+		Point2 pos=p_pos;
+		pos -= cache.bg->get_offset();
+		pos.y-=_get_title_button_height();
+		if (pos.y<0)
+			return -1;
+
+		if (h_scroll->is_visible())
+			pos.x+=h_scroll->get_val();
+		if (v_scroll->is_visible())
+			pos.y+=v_scroll->get_val();
+
+		int col,h,section;
+		TreeItem *it = _find_item_at_pos(root,pos,col,h,section);
+
+		if (it) {
+			return col;
+		}
+	}
+
+	return -1;
+
+}
+
+int Tree::get_drop_section_at_pos(const Point2& p_pos) const {
+
+	if (root) {
+
+		Point2 pos=p_pos;
+		pos -= cache.bg->get_offset();
+		pos.y-=_get_title_button_height();
+		if (pos.y<0)
+			return -100;
+
+		if (h_scroll->is_visible())
+			pos.x+=h_scroll->get_val();
+		if (v_scroll->is_visible())
+			pos.y+=v_scroll->get_val();
+
+		int col,h,section;
+		TreeItem *it = _find_item_at_pos(root,pos,col,h,section);
+
+		if (it) {
+			return section;
+		}
+	}
+
+	return -100;
+
+}
+TreeItem* Tree::get_item_at_pos(const Point2& p_pos) const {
+
+
+	if (root) {
+
+		Point2 pos=p_pos;
+		pos -= cache.bg->get_offset();
+		pos.y-=_get_title_button_height();
+		if (pos.y<0)
+			return NULL;
+
+		if (h_scroll->is_visible())
+			pos.x+=h_scroll->get_val();
+		if (v_scroll->is_visible())
+			pos.y+=v_scroll->get_val();
+
+		int col,h,section;
+		TreeItem *it = _find_item_at_pos(root,pos,col,h,section);
+
+		if (it) {
+
+			return it;
+		}
+	}
+
+	return NULL;
+
+}
+
 String Tree::get_tooltip(const Point2& p_pos) const {
 
 	if (root) {
@@ -3199,8 +3397,8 @@ String Tree::get_tooltip(const Point2& p_pos) const {
 		if (v_scroll->is_visible())
 			pos.y+=v_scroll->get_val();
 
-		int col,h;
-		TreeItem *it = _find_item_at_pos(root,pos,col,h);
+		int col,h,section;
+		TreeItem *it = _find_item_at_pos(root,pos,col,h,section);
 
 
 		if (it) {
@@ -3241,6 +3439,20 @@ void Tree::set_value_evaluator(ValueEvaluator *p_evaluator) {
 	evaluator = p_evaluator;
 }
 
+void Tree::set_drop_mode_flags(int p_flags) {
+	drop_mode_flags=p_flags;
+	if (drop_mode_flags==0) {
+		drop_mode_over=NULL;
+	}
+
+	update();
+}
+
+int Tree::get_drop_mode_flags() const {
+
+	return drop_mode_flags;
+}
+
 void Tree::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("_range_click_timeout"),&Tree::_range_click_timeout);
@@ -3273,6 +3485,8 @@ void Tree::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("get_edited_column"),&Tree::get_edited_column);
 	ObjectTypeDB::bind_method(_MD("get_custom_popup_rect"),&Tree::get_custom_popup_rect);
 	ObjectTypeDB::bind_method(_MD("get_item_area_rect","item:TreeItem","column"),&Tree::_get_item_rect,DEFVAL(-1));
+	ObjectTypeDB::bind_method(_MD("get_item_at_pos:TreeItem","pos"),&Tree::get_item_at_pos);
+	ObjectTypeDB::bind_method(_MD("get_column_at_pos","pos"),&Tree::get_column_at_pos);
 
 	ObjectTypeDB::bind_method(_MD("ensure_cursor_is_visible"),&Tree::ensure_cursor_is_visible);
 
@@ -3286,6 +3500,9 @@ void Tree::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("set_hide_folding","hide"),&Tree::set_hide_folding);
 	ObjectTypeDB::bind_method(_MD("is_folding_hidden"),&Tree::is_folding_hidden);
 
+	ObjectTypeDB::bind_method(_MD("set_drop_mode_flags","flags"),&Tree::set_drop_mode_flags);
+	ObjectTypeDB::bind_method(_MD("get_drop_mode_flags"),&Tree::get_drop_mode_flags);
+
 
 	ADD_SIGNAL( MethodInfo("item_selected"));
 	ADD_SIGNAL( MethodInfo("cell_selected"));
@@ -3300,6 +3517,11 @@ void Tree::_bind_methods() {
 	BIND_CONSTANT( SELECT_SINGLE );
 	BIND_CONSTANT( SELECT_ROW );
 	BIND_CONSTANT( SELECT_MULTI );
+
+	BIND_CONSTANT( DROP_MODE_DISABLED );
+	BIND_CONSTANT( DROP_MODE_ON_ITEM );
+	BIND_CONSTANT( DROP_MODE_INBETWEEN );
+
 }
 
 Tree::Tree() {
@@ -3381,6 +3603,11 @@ Tree::Tree() {
 	hide_folding=false;
 
 	evaluator=NULL;
+
+	drop_mode_flags=0;
+	drop_mode_over=NULL;
+	drop_mode_section=0;
+	single_select_defer=NULL;
 }
 
 
diff --git a/scene/gui/tree.h b/scene/gui/tree.h
index 75bcfd8e33..43a913392e 100644
--- a/scene/gui/tree.h
+++ b/scene/gui/tree.h
@@ -79,7 +79,9 @@ friend class Tree;
 		bool custom_color;
 		Color color;
 		bool custom_bg_color;
+		bool custom_bg_outline;
 		Color bg_color;
+
 		Variant meta;
 		String tooltip;
 
@@ -226,7 +228,7 @@ public:
 	Color get_custom_color(int p_column) const;
 	void clear_custom_color(int p_column);
 
-	void set_custom_bg_color(int p_column,const Color& p_color);
+	void set_custom_bg_color(int p_column, const Color& p_color, bool p_bg_outline=false);
 	void clear_custom_bg_color(int p_column);
 	Color get_custom_bg_color(int p_column) const;
 
@@ -257,6 +259,12 @@ public:
             SELECT_MULTI
 	};
 
+	enum DropModeFlags {
+		DROP_MODE_DISABLED=0,
+		DROP_MODE_ON_ITEM=1,
+		DROP_MODE_INBETWEEN=2
+	};
+
 private:
 friend class TreeItem;
 
@@ -265,6 +273,11 @@ friend class TreeItem;
 	TreeItem *selected_item;
 	TreeItem *edited_item;
 
+	TreeItem *drop_mode_over;
+	int drop_mode_section;
+
+	TreeItem *single_select_defer;
+	int single_select_defer_column;
 
 	int pressed_button;
 	bool pressing_for_editor;
@@ -289,6 +302,8 @@ friend class TreeItem;
 
 	int blocked;
 
+	int drop_mode_flags;
+
 	struct ColumnInfo {
 
 		int min_width;
@@ -361,6 +376,8 @@ friend class TreeItem;
 		Color font_color;
 		Color font_color_selected;
 		Color guide_color;
+		Color drop_position_color;
+
 		int hseparation;
 		int vseparation;
 		int item_margin;
@@ -405,7 +422,7 @@ friend class TreeItem;
 
 	TreeItem* _search_item_text(TreeItem *p_at, const String& p_find,int *r_col,bool p_selectable,bool p_backwards=false);
 
-	TreeItem* _find_item_at_pos(TreeItem *p_current, const Point2& p_pos,int& r_column,int &h) const;
+	TreeItem* _find_item_at_pos(TreeItem *p_current, const Point2& p_pos, int& r_column, int &h, int &section) const;
 
 /*	float drag_speed;
 	float drag_accum;
@@ -426,6 +443,8 @@ friend class TreeItem;
 
 	ValueEvaluator *evaluator;
 
+	int _count_selected_items(TreeItem* p_from) const;
+
 protected:
 	static void _bind_methods();
 
@@ -433,10 +452,16 @@ protected:
 	Object* _create_item(Object *p_parent) { return create_item(p_parent->cast_to<TreeItem>() ); }
 	TreeItem *_get_next_selected(Object *p_item) { return get_next_selected(p_item->cast_to<TreeItem>() ); }
 	Rect2 _get_item_rect(Object *p_item,int p_column) const { return get_item_rect(p_item->cast_to<TreeItem>(),p_column ); }
+
+
 public:
 
 	virtual String get_tooltip(const Point2& p_pos) const;
 
+	TreeItem* get_item_at_pos(const Point2& p_pos) const;
+	int get_column_at_pos(const Point2& p_pos) const;
+	int get_drop_section_at_pos(const Point2& p_pos) const;
+
 	void clear();
 
 	TreeItem* create_item(TreeItem *p_parent=0);
@@ -486,6 +511,9 @@ public:
 	void set_hide_folding(bool p_hide);
 	bool is_folding_hidden() const;
 
+	void set_drop_mode_flags(int p_flags);
+	int get_drop_mode_flags() const;
+
 	void set_value_evaluator(ValueEvaluator *p_evaluator);
 
 	Tree();
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 8475ca0b39..da14fa1111 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -2095,6 +2095,8 @@ void Node::_bind_methods() {
 	BIND_CONSTANT( NOTIFICATION_PAUSED );
 	BIND_CONSTANT( NOTIFICATION_UNPAUSED );
 	BIND_CONSTANT( NOTIFICATION_INSTANCED );
+	BIND_CONSTANT( NOTIFICATION_DRAG_BEGIN );
+	BIND_CONSTANT( NOTIFICATION_DRAG_END );
 
 
 
diff --git a/scene/main/node.h b/scene/main/node.h
index 560a2e588a..83086bb0cf 100644
--- a/scene/main/node.h
+++ b/scene/main/node.h
@@ -180,6 +180,8 @@ public:
 		NOTIFICATION_PARENTED=18,
 		NOTIFICATION_UNPARENTED=19,
 		NOTIFICATION_INSTANCED=20,
+		NOTIFICATION_DRAG_BEGIN=21,
+		NOTIFICATION_DRAG_END=22,
 	};
 
 	/* NODE/TREE */
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index 5017ae61ff..265ee53e58 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -985,6 +985,16 @@ void Viewport::_propagate_enter_world(Node *p_node) {
 	}
 }
 
+void Viewport::_propagate_viewport_notification(Node* p_node,int p_what) {
+
+	p_node->notification(p_what);
+	for(int i=0;i<p_node->get_child_count();i++) {
+		Node *c = p_node->get_child(i);
+		if (c->cast_to<Viewport>())
+			continue;
+		_propagate_viewport_notification(c,p_what);
+	}
+}
 
 void Viewport::_propagate_exit_world(Node *p_node) {
 
@@ -1676,6 +1686,9 @@ void Viewport::_gui_input_event(InputEvent p_event) {
 					if (p_event.mouse_button.button_index==BUTTON_LEFT) {
 						gui.drag_accum=Vector2();
 						gui.drag_attempted=false;
+						if (gui.drag_data.get_type()!=Variant::NIL) {
+							_propagate_viewport_notification(this,NOTIFICATION_DRAG_END);
+						}
 						gui.drag_data=Variant();
 					}
 
@@ -1736,6 +1749,7 @@ void Viewport::_gui_input_event(InputEvent p_event) {
 
 						gui.mouse_over->drop_data(pos,gui.drag_data);
 						gui.drag_data=Variant();
+						_propagate_viewport_notification(this,NOTIFICATION_DRAG_END);
 						//change mouse accordingly
 					}
 
@@ -1759,6 +1773,7 @@ void Viewport::_gui_input_event(InputEvent p_event) {
 				}
 
 				if (gui.drag_data.get_type()!=Variant::NIL && p_event.mouse_button.button_index==BUTTON_LEFT) {
+					_propagate_viewport_notification(this,NOTIFICATION_DRAG_END);
 					gui.drag_data=Variant(); //always clear
 				}
 
@@ -1790,6 +1805,10 @@ void Viewport::_gui_input_event(InputEvent p_event) {
 						gui.mouse_focus=NULL;
 					}
 					gui.drag_attempted=true;
+					if (gui.drag_data.get_type()!=Variant::NIL) {
+
+						_propagate_viewport_notification(this,NOTIFICATION_DRAG_BEGIN);
+					}
 				}
 			}
 
@@ -1814,6 +1833,8 @@ void Viewport::_gui_input_event(InputEvent p_event) {
 				}
 			}
 
+
+
 			if (over!=gui.mouse_over) {
 
 				if (gui.mouse_over)
@@ -1896,7 +1917,15 @@ void Viewport::_gui_input_event(InputEvent p_event) {
 
 			if (gui.drag_data.get_type()!=Variant::NIL && p_event.mouse_motion.button_mask&BUTTON_MASK_LEFT) {
 
-				/*bool can_drop =*/ over->can_drop_data(pos,gui.drag_data);
+
+				bool can_drop = over->can_drop_data(pos,gui.drag_data);
+
+				if (!can_drop) {
+					OS::get_singleton()->set_cursor_shape( OS::CURSOR_FORBIDDEN );
+				} else {
+					OS::get_singleton()->set_cursor_shape( OS::CURSOR_CAN_DROP );
+
+				}
 				//change mouse accordingly i guess
 			}
 
@@ -2367,6 +2396,9 @@ bool Viewport::is_input_disabled() const {
 	return disable_input;
 }
 
+Variant Viewport::gui_get_drag_data() const {
+	return gui.drag_data;
+}
 void Viewport::_bind_methods() {
 
 
@@ -2452,6 +2484,7 @@ void Viewport::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("warp_mouse","to_pos"), &Viewport::warp_mouse);
 
 	ObjectTypeDB::bind_method(_MD("gui_has_modal_stack"), &Viewport::gui_has_modal_stack);
+	ObjectTypeDB::bind_method(_MD("gui_get_drag_data:Variant"), &Viewport::gui_get_drag_data);
 
 	ObjectTypeDB::bind_method(_MD("set_disable_input","disable"), &Viewport::set_disable_input);
 	ObjectTypeDB::bind_method(_MD("is_input_disabled"), &Viewport::is_input_disabled);
diff --git a/scene/main/viewport.h b/scene/main/viewport.h
index afabd499a9..6107cf570f 100644
--- a/scene/main/viewport.h
+++ b/scene/main/viewport.h
@@ -159,6 +159,7 @@ friend class RenderTargetTexture;
 
 	void _propagate_enter_world(Node *p_node);
 	void _propagate_exit_world(Node *p_node);
+	void _propagate_viewport_notification(Node *p_node, int p_what);
 
 
 	void _update_stretch_transform();
@@ -361,6 +362,7 @@ public:
 
 	bool gui_has_modal_stack() const;
 
+	Variant gui_get_drag_data() const;
 
 	Viewport();
 	~Viewport();
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index 727c8eee29..ade56c4f49 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -655,6 +655,7 @@ void make_default_theme() {
 	t->set_color("selection_color","Tree", Color(0.1,0.1,1,0.8) );
 	t->set_color("cursor_color","Tree", Color(0,0,0) );
 	t->set_color("guide_color","Tree", Color(0,0,0,0.1) );
+	t->set_color("drop_position_color","Tree", Color(1,0.3,0.2) );
 
 	t->set_constant("hseparation","Tree",4);
 	t->set_constant("vseparation","Tree",4);