From f5981ff19dfa98ac2252900ce63d3ae6a2f0c003 Mon Sep 17 00:00:00 2001 From: kobewi Date: Mon, 17 Oct 2022 16:51:52 +0200 Subject: Add a separate hue gradient for OKHSL mode --- doc/classes/ColorPicker.xml | 3 +++ scene/gui/color_mode.cpp | 2 +- scene/resources/default_theme/color_picker_okhsl_hue.svg | 1 + scene/resources/default_theme/default_theme.cpp | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 scene/resources/default_theme/color_picker_okhsl_hue.svg diff --git a/doc/classes/ColorPicker.xml b/doc/classes/ColorPicker.xml index cd1d0b016d..7b71dbc362 100644 --- a/doc/classes/ColorPicker.xml +++ b/doc/classes/ColorPicker.xml @@ -151,6 +151,9 @@ Custom texture for the hue selection slider on the right. + + Custom texture for the H slider in the OKHSL color mode. + The icon for color preset drop down menu when expanded. diff --git a/scene/gui/color_mode.cpp b/scene/gui/color_mode.cpp index a063cd344a..aaba7901e4 100644 --- a/scene/gui/color_mode.cpp +++ b/scene/gui/color_mode.cpp @@ -289,7 +289,7 @@ void ColorModeOKHSL::slider_draw(int p_which) { const real_t margin = 16 * color_picker->get_theme_default_base_scale(); if (p_which == 0) { // H - Ref hue = color_picker->get_theme_icon(SNAME("color_hue"), SNAME("ColorPicker")); + Ref hue = color_picker->get_theme_icon(SNAME("color_okhsl_hue"), SNAME("ColorPicker")); slider->draw_set_transform(Point2(), -Math_PI / 2, Size2(1.0, 1.0)); slider->draw_texture_rect(hue, Rect2(Vector2(margin * -1, 0), Vector2(margin, size.x)), false); return; diff --git a/scene/resources/default_theme/color_picker_okhsl_hue.svg b/scene/resources/default_theme/color_picker_okhsl_hue.svg new file mode 100644 index 0000000000..dfd1d5e2b5 --- /dev/null +++ b/scene/resources/default_theme/color_picker_okhsl_hue.svg @@ -0,0 +1 @@ + diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index aa271e6f4b..b4b9542f18 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -888,6 +888,7 @@ void fill_default_theme(Ref &theme, const Ref &default_font, const theme->set_icon("shape_rect_wheel", "ColorPicker", icons["picker_shape_rectangle_wheel"]); theme->set_icon("add_preset", "ColorPicker", icons["add"]); theme->set_icon("color_hue", "ColorPicker", icons["color_picker_hue"]); + theme->set_icon("color_okhsl_hue", "ColorPicker", icons["color_picker_okhsl_hue"]); theme->set_icon("sample_bg", "ColorPicker", icons["mini_checkerboard"]); theme->set_icon("overbright_indicator", "ColorPicker", icons["color_picker_overbright"]); theme->set_icon("bar_arrow", "ColorPicker", icons["color_picker_bar_arrow"]); -- cgit v1.2.3