summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-01-19 10:00:42 +0100
committerGitHub <noreply@github.com>2019-01-19 10:00:42 +0100
commitd10f8027a4901fee0bcbca1362520c6dea52db9d (patch)
treeae3ab94830442ad09c955b80694df66a532d073c
parent632ff1634b03dda3a7e7086e6bf465874fd07acb (diff)
parent4b7830645945653b6053565462fa47f6962a19b1 (diff)
Merge pull request #25114 from Calinou/fix-colorpicker-rounding
Fix a rounding error in ColorPicker
-rw-r--r--scene/gui/color_picker.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index b99128e65f..6ed465562e 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -176,14 +176,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(100);
if (i == 3)
scroll[i]->set_max(1);
scroll[i]->set_value(color.components[i]);
} else {
- const int byte_value = color.components[i] * 255;
+ scroll[i]->set_step(1);
+ const float byte_value = color.components[i] * 255.0;
scroll[i]->set_max(next_power_of_2(MAX(255, byte_value)) - 1);
scroll[i]->set_value(byte_value);
}