casraf/redot-engine
1
0
Fork 0
mirror of https://github.com/chenasraf/redot-engine.git synced 2026-05-18 01:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #794 from Spartan322/4.3-fixes/colorpicker-jank

Browse Source 
[4.3] Fix RGB/RAW `ColorMode` jank sliders and spinbox
This commit is contained in:
George L. Albany
2024-10-25 10:47:06 +00:00
committed by GitHub
parent d8eab9a9d2 7a16a43ce8
commit abe786d9cd
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scene/gui/color_mode.cpp
View File

@@ -47,8 +47,7 @@ String ColorModeRGB::get_slider_label(int idx) const {
float ColorModeRGB::get_slider_max(int idx) const {
ERR_FAIL_INDEX_V_MSG(idx, 4, 0, "Couldn't get slider max value.");
Color color = color_picker->get_pick_color();
return next_power_of_2(MAX(255, color.components[idx] * 255.0)) - 1;
return slider_max[idx];
}
float ColorModeRGB::get_slider_value(int idx) const {

6
scene/gui/color_mode.h
View File

@@ -89,6 +89,7 @@ public:
class ColorModeRGB : public ColorMode {
public:
String labels[3] = { "R", "G", "B" };
float slider_max[4] = { 255, 255, 255, 255 };
virtual String get_name() const override { return "RGB"; }
@@ -108,12 +109,11 @@ public:
class ColorModeRAW : public ColorMode {
public:
String labels[3] = { "R", "G", "B" };
float slider_max[4] = { 100, 100, 100, 1 };
float slider_max[4] = { 1, 1, 1, 1 };
virtual String get_name() const override { return "RAW"; }
virtual float get_slider_step() const override { return 0.001; }
virtual float get_spinbox_arrow_step() const override { return 0.01; }
virtual float get_slider_step() const override { return 1.0 / 255.0; }
virtual String get_slider_label(int idx) const override;
virtual float get_slider_max(int idx) const override;
virtual float get_slider_value(int idx) const override;