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

Merge pull request #111248 from J4RH/colorpicker-reverting-fix

Browse Source 
Check that ColorPickerButton popup is currently open in `_modal_closed()`
This commit is contained in:
Thaddeus Crews
2025-10-06 09:06:27 -05:00
parent f9a2ecd184 3d0daf15e1
commit dac4704447
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scene/gui/color_picker.cpp
View File

@ -2442,12 +2442,14 @@ void ColorPickerButton::_color_changed(const Color &p_color) {
} }
void ColorPickerButton::_modal_closed() { void ColorPickerButton::_modal_closed() {
if (picker->is_visible_in_tree()) {
if (Input::get_singleton()->is_action_just_pressed(SNAME("ui_cancel"))) { if (Input::get_singleton()->is_action_just_pressed(SNAME("ui_cancel"))) {
set_pick_color(picker->get_old_color()); set_pick_color(picker->get_old_color());
emit_signal(SNAME("color_changed"), color); emit_signal(SNAME("color_changed"), color);
} }
emit_signal(SNAME("popup_closed")); emit_signal(SNAME("popup_closed"));
set_pressed(false); set_pressed(false);
}
if (!get_tree()->get_root()->is_embedding_subwindows()) { if (!get_tree()->get_root()->is_embedding_subwindows()) {
get_viewport()->set_disable_input(false); get_viewport()->set_disable_input(false);
} }