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

Repiteo · Repiteo · commit dac470444718 · 2025-10-06T09:06:27.000-05:00
Check that ColorPickerButton popup is currently open in `_modal_closed()`
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
@@ -2442,12 +2442,14 @@ void ColorPickerButton::_color_changed(const Color &p_color) {
 }
 
 void ColorPickerButton::_modal_closed() {
-	if (Input::get_singleton()->is_action_just_pressed(SNAME("ui_cancel"))) {
-		set_pick_color(picker->get_old_color());
-		emit_signal(SNAME("color_changed"), color);
+	if (picker->is_visible_in_tree()) {
+		if (Input::get_singleton()->is_action_just_pressed(SNAME("ui_cancel"))) {
+			set_pick_color(picker->get_old_color());
+			emit_signal(SNAME("color_changed"), color);
+		}
+		emit_signal(SNAME("popup_closed"));
+		set_pressed(false);
 	}
-	emit_signal(SNAME("popup_closed"));
-	set_pressed(false);
 	if (!get_tree()->get_root()->is_embedding_subwindows()) {
 		get_viewport()->set_disable_input(false);
 	}

Original file line number	Diff line number	Diff line change
`@@ -2442,12 +2442,14 @@ void ColorPickerButton::_color_changed(const Color &p_color) {`
`2442`	`2442`	`}`
`2443`	`2443`
`2444`	`2444`	`void ColorPickerButton::_modal_closed() {`
`2445`		`- if (Input::get_singleton()->is_action_just_pressed(SNAME("ui_cancel"))) {`
`2446`		`- set_pick_color(picker->get_old_color());`
`2447`		`- emit_signal(SNAME("color_changed"), color);`
	`2445`	`+ if (picker->is_visible_in_tree()) {`
	`2446`	`+ if (Input::get_singleton()->is_action_just_pressed(SNAME("ui_cancel"))) {`
	`2447`	`+ set_pick_color(picker->get_old_color());`
	`2448`	`+ emit_signal(SNAME("color_changed"), color);`
	`2449`	`+ }`
	`2450`	`+ emit_signal(SNAME("popup_closed"));`
	`2451`	`+ set_pressed(false);`
`2448`	`2452`	`}`
`2449`		`- emit_signal(SNAME("popup_closed"));`
`2450`		`- set_pressed(false);`
`2451`	`2453`	`if (!get_tree()->get_root()->is_embedding_subwindows()) {`
`2452`	`2454`	`get_viewport()->set_disable_input(false);`
`2453`	`2455`	`}`