aboutsummaryrefslogtreecommitdiff
path: root/scene/gui/color_picker.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2017-01-08 16:28:12 -0300
committerJuan Linietsky2017-01-08 16:28:12 -0300
commit920947f297ff3b8d959d15c8e15e7a28dcbdb08f (patch)
tree160ca184a2d8ec1a43238d25e10ef198bdd6b5c8 /scene/gui/color_picker.cpp
parent0a59c3c3a6a8c13a5c82d59d9587fca31f900604 (diff)
downloadgodot-920947f297ff3b8d959d15c8e15e7a28dcbdb08f.tar.gz
godot-920947f297ff3b8d959d15c8e15e7a28dcbdb08f.tar.zst
godot-920947f297ff3b8d959d15c8e15e7a28dcbdb08f.zip
Diffstat (limited to 'scene/gui/color_picker.cpp')
-rw-r--r--scene/gui/color_picker.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index 10f4ae9fe..9083bdc12 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -442,7 +442,7 @@ void ColorPicker::_screen_pick_pressed()
r->add_child(screen);
screen->set_as_toplevel(true);
screen->set_area_as_parent_rect();
- screen->connect("input_event",this,"_screen_input");
+ screen->connect("gui_input",this,"_screen_input");
}
screen->raise();
screen->show_modal();
@@ -502,7 +502,7 @@ ColorPicker::ColorPicker() :
uv_edit->set_ignore_mouse(false);
- uv_edit->connect("input_event", this, "_uv_input");
+ uv_edit->connect("gui_input", this, "_uv_input");
uv_edit->set_stop_mouse(false);
uv_edit->set_custom_minimum_size(Size2 (256,256));
Vector<Variant> args=Vector<Variant>();
@@ -515,7 +515,7 @@ ColorPicker::ColorPicker() :
w_edit= memnew( Control );
w_edit->set_ignore_mouse(false);
w_edit->set_custom_minimum_size(Size2(30,256));
- w_edit->connect("input_event", this, "_w_input");
+ w_edit->connect("gui_input", this, "_w_input");
args.clear();
args.push_back(1);
args.push_back(w_edit);
@@ -593,7 +593,7 @@ ColorPicker::ColorPicker() :
preset = memnew( TextureFrame );
bbc->add_child(preset);
preset->set_ignore_mouse(false);
- preset->connect("input_event", this, "_preset_input");
+ preset->connect("gui_input", this, "_preset_input");
bt_add_preset = memnew ( Button );
bt_add_preset->set_icon(get_icon("add_preset"));