From 2436bc0b2c57b6b934c43259a66a286cf8b0088f Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Fri, 8 Nov 2013 15:25:41 +0100
Subject: [PATCH] QmlDesigner.PropertyEditor: avoid setting saturation to 0
Block while changing hsl values.
Task-number: QTCREATORBUG-10709
Change-Id: I13a0e873c47ce7d2ea69ab42862c95ade395b7f0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
.../HelperWidgets/ColorButton.qml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorButton.qml
index 6c81e0ac43f..b50dcbbc5f1 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorButton.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorButton.qml
@@ -62,7 +62,11 @@ Item {
colorButton.alpha = myAlpha
}
+ property bool block: false
+
function invalidateColor() {
+ if (block)
+ return;
colorButton.color = Qt.hsla(hue, saturation, lightness, alpha);
hueSlider.value = hue
hueSlider2.value = hue
@@ -95,11 +99,16 @@ Item {
h /= 6
}
+ block = true
+
if (s > 0)
colorButton.hue = h
colorButton.saturation = s
colorButton.lightness = l
+
+ block = false
+ invalidateColor()
}
Image {
--
GitLab