Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 15:21:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #783 from Spartan322/4.3-correct/colorpicker-raw-sliders

Browse Source 
[4.3] Unify `ColorPicker` color mode slider colors
This commit is contained in:
George L. Albany
2024-10-25 06:34:05 +00:00
committed by GitHub
parent 17ad602f3f e3650df0e4
commit 8e47d7623b
2 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
scene/gui/color_mode.cpp
View File

@@ -254,30 +254,27 @@ void ColorModeRAW::slider_draw(int p_which) {
left_color.a = 0; left_color.a = 0;
right_color = color; right_color = color;
right_color.a = 1; right_color.a = 1;
} else {
col.set(0, left_color); left_color = Color(
col.set(1, right_color); p_which == 0 ? 0 : color.r,
col.set(2, right_color); p_which == 1 ? 0 : color.g,
col.set(3, left_color); p_which == 2 ? 0 : color.b);
pos.set(0, Vector2(0, 0)); right_color = Color(
pos.set(1, Vector2(size.x, 0)); p_which == 0 ? 1 : color.r,
pos.set(2, Vector2(size.x, margin)); p_which == 1 ? 1 : color.g,
pos.set(3, Vector2(0, margin)); p_which == 2 ? 1 : color.b);
slider->draw_polygon(pos, col);
}
}
bool ColorModeRAW::apply_theme() const {
for (int i = 0; i < 4; i++) {
HSlider *slider = color_picker->get_slider(i);
slider->remove_theme_icon_override("grabber");
slider->remove_theme_icon_override("grabber_highlight");
slider->remove_theme_style_override("slider");
slider->remove_theme_constant_override("grabber_offset");
} }
return true; col.set(0, left_color);
col.set(1, right_color);
col.set(2, right_color);
col.set(3, left_color);
pos.set(0, Vector2(0, 0));
pos.set(1, Vector2(size.x, 0));
pos.set(2, Vector2(size.x, margin));
pos.set(3, Vector2(0, margin));
slider->draw_polygon(pos, col);
} }
void ColorModeOKHSL::_value_changed() { void ColorModeOKHSL::_value_changed() {

1
scene/gui/color_mode.h
View File

@@ -121,7 +121,6 @@ public:
virtual Color get_color() const override; virtual Color get_color() const override;
virtual void slider_draw(int p_which) override; virtual void slider_draw(int p_which) override;
virtual bool apply_theme() const override;
ColorModeRAW(ColorPicker *p_color_picker) : ColorModeRAW(ColorPicker *p_color_picker) :
ColorMode(p_color_picker){}; ColorMode(p_color_picker){};