godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #110160 from WhalesState/cp-intensity

Browse Source 
Fix ColorPicker after adding intensity sliders.
This commit is contained in:
Thaddeus Crews
2025-09-01 11:14:11 -05:00
parent 7e88218cb5 5412885a7a
commit cbed98c683
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor_node.cpp
View File

@@ -4308,7 +4308,7 @@ void EditorNode::setup_color_picker(ColorPicker *p_picker) {
p_picker->set_editor_settings(EditorSettings::get_singleton()); p_picker->set_editor_settings(EditorSettings::get_singleton());
int default_color_mode = EditorSettings::get_singleton()->get_project_metadata("color_picker", "color_mode", EDITOR_GET("interface/inspector/default_color_picker_mode")); int default_color_mode = EditorSettings::get_singleton()->get_project_metadata("color_picker", "color_mode", EDITOR_GET("interface/inspector/default_color_picker_mode"));
int picker_shape = EditorSettings::get_singleton()->get_project_metadata("color_picker", "picker_shape", EDITOR_GET("interface/inspector/default_color_picker_shape")); int picker_shape = EditorSettings::get_singleton()->get_project_metadata("color_picker", "picker_shape", EDITOR_GET("interface/inspector/default_color_picker_shape"));
bool show_intensity = EditorSettings::get_singleton()->get_project_metadata("color_picker", "show_intensity", EDITOR_GET("interface/inspector/color_picker_show_intensity")); bool show_intensity = EDITOR_GET("interface/inspector/color_picker_show_intensity");
p_picker->set_color_mode((ColorPicker::ColorModeType)default_color_mode); p_picker->set_color_mode((ColorPicker::ColorModeType)default_color_mode);
p_picker->set_picker_shape((ColorPicker::PickerShapeType)picker_shape); p_picker->set_picker_shape((ColorPicker::PickerShapeType)picker_shape);

1
scene/gui/color_picker.cpp
View File

@@ -972,6 +972,7 @@ void ColorPicker::set_picker_shape(PickerShapeType p_shape) {
} }
#endif #endif
_copy_normalized_to_hsv_okhsl();
_update_controls(); _update_controls();
_update_color(); _update_color();
} }