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

Merge pull request #41920 from Chaosus/fix_colorpicker

Browse Source 
Fix ColorPickerButton to apply changes after picker popup closed
This commit is contained in:
Rémi Verschelde 2020-09-10 10:02:14 +02:00 committed by GitHub
commit 0942af841c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/gui/color_picker.cpp
View File

@ -873,6 +873,7 @@ void ColorPickerButton::_color_changed(const Color &p_color) {
void ColorPickerButton::_modal_closed() { void ColorPickerButton::_modal_closed() {
emit_signal("popup_closed"); emit_signal("popup_closed");
set_pressed(false);
} }
void ColorPickerButton::pressed() { void ColorPickerButton::pressed() {
@ -976,9 +977,8 @@ void ColorPickerButton::_update_picker() {
popup->add_child(picker); popup->add_child(picker);
add_child(popup); add_child(popup);
picker->connect("color_changed", callable_mp(this, &ColorPickerButton::_color_changed)); picker->connect("color_changed", callable_mp(this, &ColorPickerButton::_color_changed));
popup->connect("modal_closed", callable_mp(this, &ColorPickerButton::_modal_closed));
popup->connect("about_to_popup", callable_mp((BaseButton *)this, &BaseButton::set_pressed), varray(true)); popup->connect("about_to_popup", callable_mp((BaseButton *)this, &BaseButton::set_pressed), varray(true));
popup->connect("popup_hide", callable_mp((BaseButton *)this, &BaseButton::set_pressed), varray(false)); popup->connect("popup_hide", callable_mp(this, &ColorPickerButton::_modal_closed));
picker->set_pick_color(color); picker->set_pick_color(color);
picker->set_edit_alpha(edit_alpha); picker->set_edit_alpha(edit_alpha);
emit_signal("picker_created"); emit_signal("picker_created");