diff options
| author | Guh-Feng <58538080+Guh-Feng@users.noreply.github.com> | 2022-06-30 23:43:46 -0400 |
|---|---|---|
| committer | Guh-Feng <58538080+Guh-Feng@users.noreply.github.com> | 2022-07-21 18:11:09 -0400 |
| commit | 1b8652e86a383747cc2d8ec803b4dcd49cb7469d (patch) | |
| tree | 1a08bd998705cf549b3e4543c485c825e0191dd9 /editor/editor_properties.cpp | |
| parent | 976cb7ea9f59813f99e06c4c345c19ff68c2c591 (diff) | |
| download | redot-engine-1b8652e86a383747cc2d8ec803b4dcd49cb7469d.tar.gz | |
Color Pickers Respect Settings
Updated editor_node with function that sets up color pickers throughout Godot to respect editor's settings.
Diffstat (limited to 'editor/editor_properties.cpp')
| -rw-r--r-- | editor/editor_properties.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index aaa518362c..0f8d43ccf5 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -3007,14 +3007,6 @@ void EditorPropertyColor::_popup_closed() { } } -void EditorPropertyColor::_picker_created() { - // get default color picker mode from editor settings - int default_color_mode = EDITOR_GET("interface/inspector/default_color_picker_mode"); - picker->get_picker()->set_color_mode((ColorPicker::ColorModeType)default_color_mode); - int picker_shape = EDITOR_GET("interface/inspector/default_color_picker_shape"); - picker->get_picker()->set_picker_shape((ColorPicker::PickerShapeType)picker_shape); -} - void EditorPropertyColor::_picker_opening() { last_color = picker->get_pick_color(); } @@ -3059,7 +3051,7 @@ EditorPropertyColor::EditorPropertyColor() { 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("picker_created", callable_mp(this, &EditorPropertyColor::_picker_created)); + picker->get_popup()->connect("about_to_popup", callable_mp(EditorNode::get_singleton(), &EditorNode::setup_color_picker), varray(picker->get_picker())); picker->get_popup()->connect("about_to_popup", callable_mp(this, &EditorPropertyColor::_picker_opening)); } |