diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2018-05-18 00:32:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-18 00:32:51 +0200 |
commit | 2aafd928317776c0e896d6c2d3f019d4ce800c98 (patch) | |
tree | 112c91e9c6a17563cf651b1e07ddb3d5b1c4a35f | |
parent | c8831fefc68fb77c3a6a23562619c2a63bc68160 (diff) | |
parent | c58e1555801216d536d85f4fda9ebbb938714aed (diff) |
Merge pull request #18981 from capnm/fix_color_picker
Fix color-picker sliders
-rw-r--r-- | scene/gui/color_picker.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index 34891832e2..84793110f0 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -158,15 +158,14 @@ void ColorPicker::_update_color() { updating = true; for (int i = 0; i < 4; i++) { - scroll[i]->set_step(0.01); if (raw_mode_enabled) { - scroll[i]->set_max(100); - if (i == 3) - scroll[i]->set_max(1); + scroll[i]->set_step(0.01); + scroll[i]->set_max(1); scroll[i]->set_value(color.components[i]); } else { + scroll[i]->set_step(1); + scroll[i]->set_max(255); const int byte_value = color.components[i] * 255; - scroll[i]->set_max(next_power_of_2(MAX(255, byte_value)) - 1); scroll[i]->set_value(byte_value); } } |