From 893ce62967b08e337a72ecd965caf837d2117f2b Mon Sep 17 00:00:00 2001 From: yds Date: Sat, 26 Oct 2024 18:41:16 -0300 Subject: Fix `ColorPicker`'s remote synchronization when typing values --- editor/editor_properties.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'editor/editor_properties.cpp') diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index 158ea4b8a7..68ebffbc69 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -2628,7 +2628,7 @@ EditorPropertyColor::EditorPropertyColor() { add_child(picker); picker->set_flat(true); picker->connect("color_changed", callable_mp(this, &EditorPropertyColor::_color_changed)); - picker->connect("popup_closed", callable_mp(this, &EditorPropertyColor::_popup_closed)); + picker->connect("popup_closed", callable_mp(this, &EditorPropertyColor::_popup_closed), CONNECT_DEFERRED); picker->get_popup()->connect("about_to_popup", callable_mp(EditorNode::get_singleton(), &EditorNode::setup_color_picker).bind(picker->get_picker())); picker->get_popup()->connect("about_to_popup", callable_mp(this, &EditorPropertyColor::_picker_opening)); } -- cgit v1.2.3 From 289e548e3477afe73a509cd3888b0dbb716735cb Mon Sep 17 00:00:00 2001 From: kobewi Date: Fri, 22 Nov 2024 01:09:24 +0100 Subject: Untangle ColorPicker includes --- editor/editor_properties.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'editor/editor_properties.cpp') diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index 2b2b32eb22..9b3304254b 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -52,6 +52,7 @@ #include "scene/3d/fog_volume.h" #include "scene/3d/gpu_particles_3d.h" #include "scene/gui/color_picker.h" +#include "scene/gui/grid_container.h" #include "scene/main/window.h" #include "scene/resources/font.h" #include "scene/resources/mesh.h" -- cgit v1.2.3