feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner.PropertyEditor: Fix control for saturation

Browse Source 
If the lightness or saturation are 0 then hue is undefined.
If lightness is 0 then saturation is undefined/0.

Nevertheless we should keep the old values in the ui, because
the user should not loose the values in case he increases lightness
or saturation later.

Change-Id: I9fd80f6ca84fa08ef62d9fbb6dd4afce992c3546
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-01-05 14:35:22 +01:00
committed by Thomas Hartmann
parent a5e2b4b149
commit bced09cd1f
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorButton.qml
View File

@@ -74,9 +74,17 @@ Item {
block = true block = true
colorButton.color = Qt.hsla(hue, saturation, lightness, alpha); colorButton.color = Qt.hsla(hue, saturation, lightness, alpha);
hueSlider.value = hue
hueSlider2.value = hue if (saturation > 0.0 && lightness > 0.0) {
saturationSlider.value = saturation hueSlider.value = hue
hueSlider2.value = hue
}
if (lightness > 0.0)
saturationSlider.value = saturation
else
saturation = saturationSlider.value
lightnessSlider.value = lightness lightnessSlider.value = lightness
alphaSlider.value = alpha alphaSlider.value = alpha