drag & drop demo (GUI)

4 files changed, 32 insertions, 0 deletions

diff --git a/demos/gui/drag_and_drop/drag_and_drop.scn b/demos/gui/drag_and_drop/drag_and_drop.scn
new file mode 100644
index 0000000000..f2122a459e
--- /dev/null
+++ b/demos/gui/drag_and_drop/drag_and_drop.scn
diff --git a/demos/gui/drag_and_drop/drag_drop_script.gd b/demos/gui/drag_and_drop/drag_drop_script.gd
new file mode 100644
index 0000000000..a99b963efa
--- /dev/null
+++ b/demos/gui/drag_and_drop/drag_drop_script.gd
@@ -0,0 +1,27 @@
+
+extends ColorPickerButton
+
+# member variables here, example:
+# var a=2
+# var b="textvar"
+func get_drag_data(pos):
+	
+	#use another control as drag preview
+	var cpb = ColorPickerButton.new()
+	cpb.set_color( get_color() )
+	cpb.set_size(Vector2(50,50))
+	set_drag_preview(cpb)
+	#return color as drag data
+	return get_color()
+	
+func can_drop_data(pos, data):
+	return typeof(data)==TYPE_COLOR
+	
+func drop_data(pos, data):
+	set_color(data)
+		
+func _ready():
+	# Initialization here
+	pass
+
+
diff --git a/demos/gui/drag_and_drop/engine.cfg b/demos/gui/drag_and_drop/engine.cfg
new file mode 100644
index 0000000000..448939c61d
--- /dev/null
+++ b/demos/gui/drag_and_drop/engine.cfg
@@ -0,0 +1,4 @@
+[application]
+
+name="Drag & Drop (GUI)"
+main_scene="res://drag_and_drop.scn"
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index 193649c815..d944b804a5 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -352,6 +352,7 @@ void ColorPickerButton::set_color(const Color& p_color){
 
 
 	picker->set_color(p_color);
+	update();
 }
 Color ColorPickerButton::get_color() const{