Merge pull request #86129 from TheSofox/color-picker-memory

Remember last `color_mode` and `picker_shape` in `ColorPicker`s in the editor
godotengine · Dec 14, 2023 · a5529f7 · a5529f7
2 parents 302e41c + 7979412
commit a5529f7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
@@ -3701,8 +3701,9 @@ void EditorNode::_set_current_scene_nocheck(int p_idx) {
 
 void EditorNode::setup_color_picker(ColorPicker *p_picker) {
  p_picker->set_editor_settings(EditorSettings::get_singleton());
- int default_color_mode = EDITOR_GET("interface/inspector/default_color_picker_mode");
- int picker_shape = EDITOR_GET("interface/inspector/default_color_picker_shape");
+ 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"));
+
  p_picker->set_color_mode((ColorPicker::ColorModeType)default_color_mode);
  p_picker->set_picker_shape((ColorPicker::PickerShapeType)picker_shape);
 }

diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
@@ -693,6 +693,12 @@ void ColorPicker::set_picker_shape(PickerShapeType p_shape) {
 
  current_shape = p_shape;
 
+#ifdef TOOLS_ENABLED
+ if (editor_settings) {
+ editor_settings->call(SNAME("set_project_metadata"), "color_picker", "picker_shape", current_shape);
+ }
+#endif
+
  _copy_color_to_hsv();
 
  _update_controls();
@@ -927,6 +933,12 @@ void ColorPicker::set_color_mode(ColorModeType p_mode) {
 
  current_mode = p_mode;
 
+#ifdef TOOLS_ENABLED
+ if (editor_settings) {
+ editor_settings->call(SNAME("set_project_metadata"), "color_picker", "color_mode", current_mode);
+ }
+#endif
+
  if (!is_inside_tree()) {
  return;
  }