Merge pull request #46230 from gongpha/keep-hue-value

Keep Hue value when Saturation or Value is zero
This commit is contained in:
Rémi Verschelde 2021-02-21 23:36:19 +01:00 committed by GitHub
commit 14f6f92a72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -166,10 +166,13 @@ void ColorPicker::_value_changed(double) {
}
if (hsv_mode_enabled) {
color.set_hsv(scroll[0]->get_value() / 360.0,
scroll[1]->get_value() / 100.0,
scroll[2]->get_value() / 100.0,
scroll[3]->get_value() / 255.0);
h = scroll[0]->get_value() / 360.0;
s = scroll[1]->get_value() / 100.0;
v = scroll[2]->get_value() / 100.0;
color.set_hsv(h, s, v, scroll[3]->get_value() / 255.0);
last_hsv = color;
} else {
for (int i = 0; i < 4; i++) {
color.components[i] = scroll[i]->get_value() / (raw_mode_enabled ? 1.0 : 255.0);