godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5863 from MarianoGnu/master 

Fix pick color from screen. Closes #5853
This commit is contained in:
Mariano Javier Suligoy 2016-07-22 20:39:19 -03:00 committed by GitHub
parent 5182fe2ef9 f00e0b589f
commit 71c12b5801
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scene/gui/color_picker.cpp
View File

@ -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();
}