diff options
author | Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> | 2016-07-22 20:39:19 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-22 20:39:19 -0300 |
commit | 71c12b58014e9ccdce14c8256ac23b8ef969c98e (patch) | |
tree | dff65a5f1fb2cd2d028373745ab9453c72da90eb | |
parent | 5182fe2ef9c3a862362866546ffd2cdd6149cd8c (diff) | |
parent | f00e0b589f94413afd446c63d941ced77fdda539 (diff) |
Merge pull request #5863 from MarianoGnu/master
Fix pick color from screen. Closes #5853
-rw-r--r-- | scene/gui/color_picker.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index c8bd9749df..b69646432e 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -415,11 +415,12 @@ void ColorPicker::_screen_pick_pressed() if (!screen) { screen=memnew( Control ); r->add_child(screen); + screen->set_as_toplevel(true); screen->set_area_as_parent_rect(); screen->connect("input_event",this,"_screen_input"); } screen->raise(); - screen->show(); + screen->show_modal(); r->queue_screen_capture(); } |