Add Various ColorPicker shapes

godotengine · Apr 6, 2021 · 6294507 · 6294507
1 parent 55faf1c
commit 6294507
Show file tree

Hide file tree

Showing 12 changed files with 348 additions and 78 deletions.
diff --git a/doc/classes/ColorPicker.xml b/doc/classes/ColorPicker.xml
@@ -51,6 +51,9 @@
  If [code]true[/code], allows editing the color with Hue/Saturation/Value sliders.
  [b]Note:[/b] Cannot be enabled if raw mode is on.
  </member>
+ <member name="picker_shape" type="int" setter="set_picker_shape" getter="get_picker_shape" default="0">
+ The shape of the color space view. See [enum PickerShapeType].
+ </member>
  <member name="presets_enabled" type="bool" setter="set_presets_enabled" getter="are_presets_enabled" default="true">
  If [code]true[/code], the "add preset" button is enabled.
  </member>
@@ -86,6 +89,15 @@
  </signal>
  </signals>
  <constants>
+ <constant name="SHAPE_HSV_RECTANGLE" value="0" enum="PickerShapeType">
+ HSV Color Model rectangle color space.
+ </constant>
+ <constant name="SHAPE_HSV_WHEEL" value="1" enum="PickerShapeType">
+ HSV Color Model rectangle color space with a wheel.
+ </constant>
+ <constant name="SHAPE_VHS_CIRCLE" value="2" enum="PickerShapeType">
+ HSV Color Model circle color space. Use Saturation as a radius.
+ </constant>
  </constants>
  <theme_items>
  <theme_item name="add_preset" type="Texture2D">

diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
@@ -5892,6 +5892,8 @@ EditorNode::EditorNode() {
  EDITOR_DEF("interface/inspector/resources_to_open_in_new_inspector", "Script,MeshLibrary,TileSet");
  EDITOR_DEF("interface/inspector/default_color_picker_mode", 0);
  EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "interface/inspector/default_color_picker_mode", PROPERTY_HINT_ENUM, "RGB,HSV,RAW", PROPERTY_USAGE_DEFAULT));
+ EDITOR_DEF("interface/inspector/default_color_picker_shape", (int32_t)ColorPicker::SHAPE_VHS_CIRCLE);
+ EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "interface/inspector/default_color_picker_shape", PROPERTY_HINT_ENUM, "HSV Rectangle,HSV Rectangle Wheel,VHS Circle", PROPERTY_USAGE_DEFAULT));
  EDITOR_DEF("run/auto_save/save_before_running", true);
 
  theme_base = memnew(Control);

diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp
@@ -2190,6 +2190,9 @@ void EditorPropertyColor::_picker_created() {
  } else if (default_color_mode == 2) {
  picker->get_picker()->set_raw_mode(true);
  }
+
+ 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() {

diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp
@@ -1282,6 +1282,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
  theme->set_icon("preset_bg", "ColorPicker", theme->get_icon("GuiMiniCheckerboard", "EditorIcons"));
  theme->set_icon("overbright_indicator", "ColorPicker", theme->get_icon("OverbrightIndicator", "EditorIcons"));
  theme->set_icon("bar_arrow", "ColorPicker", theme->get_icon("ColorPickerBarArrow", "EditorIcons"));
+ theme->set_icon("picker_cursor", "ColorPicker", theme->get_icon("PickerCursor", "EditorIcons"));
 
  theme->set_icon("bg", "ColorPickerButton", theme->get_icon("GuiMiniCheckerboard", "EditorIcons"));
 

diff --git a/editor/icons/PickerCursor.svg b/editor/icons/PickerCursor.svg
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
@@ -1721,6 +1721,9 @@ void ScriptTextEditor::_enable_code_editor() {
  color_picker->set_raw_mode(true);
  }
 
+ int picker_shape = EDITOR_GET("interface/inspector/default_color_picker_shape");
+ color_picker->set_picker_shape((ColorPicker::PickerShapeType)picker_shape);
+
  quick_open = memnew(ScriptEditorQuickOpen);
  quick_open->connect("goto_line", callable_mp(this, &ScriptTextEditor::_goto_line));
  add_child(quick_open);

diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp
@@ -832,6 +832,9 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant::
  } else if (default_color_mode == 2) {
  color_picker->set_raw_mode(true);
  }
+
+ int picker_shape = EDITOR_GET("interface/inspector/default_color_picker_shape");
+ color_picker->set_picker_shape((ColorPicker::PickerShapeType)picker_shape);
  }
 
  color_picker->show();