From e8dce91481649f56da6aa48f8f5c23bccd9e648a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com> Date: Fri, 18 May 2018 01:49:45 +0200 Subject: [PATCH] Revert "Fix color-picker sliders" --- scene/gui/color_picker.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index 84793110f06..34891832e2a 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -158,14 +158,15 @@ 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_step(0.01); - scroll[i]->set_max(1); + scroll[i]->set_max(100); + if (i == 3) + 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); } }