From 7222df86d11793a7ff681adb4c681998b5ff984f Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 31 Mar 2020 16:15:17 +0200 Subject: [PATCH] QmlDesigner: Rename signal The name clicked is missleading. Change-Id: I2782d1af5c0bd8a58c24729f043291b482cec6a8 Reviewed-by: Aleksei German Reviewed-by: Tim Jenssen --- .../imports/HelperWidgets/ColorButton.qml | 20 +++++++++---------- .../imports/HelperWidgets/ColorEditor.qml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml index 8381513548f..e609297149d 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml @@ -41,7 +41,7 @@ Item { property bool block: false - signal clicked + signal updateColor signal rightMouseButtonClicked onAlphaChanged: invalidateColor(); @@ -216,7 +216,7 @@ Item { } onReleased: { if (mouse.button === Qt.LeftButton) - colorButton.clicked() + colorButton.updateColor() } acceptedButtons: Qt.LeftButton | Qt.RightButton @@ -245,7 +245,7 @@ Item { if (colorButton.hue !== value) colorButton.hue = value } - onClicked: colorButton.clicked() + onClicked: colorButton.updateColor() } Row { @@ -278,7 +278,7 @@ Item { var tmp = redSlider.value / 255.0 if (colorButton.color.r !== tmp && !colorButton.block) { colorButton.color.r = tmp - colorButton.clicked() + colorButton.updateColor() } } } @@ -307,7 +307,7 @@ Item { var tmp = greenSlider.value / 255.0 if (colorButton.color.g !== tmp && !colorButton.block) { colorButton.color.g = tmp - colorButton.clicked() + colorButton.updateColor() } } } @@ -336,7 +336,7 @@ Item { var tmp = blueSlider.value / 255.0 if (colorButton.color.b !== tmp && !colorButton.block) { colorButton.color.b = tmp - colorButton.clicked() + colorButton.updateColor() } } } @@ -359,7 +359,7 @@ Item { onValueModified: { if (colorButton.alpha !== alphaSlider.value && !colorButton.block) { colorButton.alpha = alphaSlider.value - colorButton.clicked() + colorButton.updateColor() } } } @@ -384,7 +384,7 @@ Item { onValueModified: { if (colorButton.hue !== hueSlider2.value && !colorButton.block) { colorButton.hue = hueSlider2.value - colorButton.clicked() + colorButton.updateColor() } } } @@ -406,7 +406,7 @@ Item { onValueModified: { if (colorButton.saturation !== saturationSlider.value && !colorButton.block) { colorButton.saturation = saturationSlider.value - colorButton.clicked() + colorButton.updateColor() } } } @@ -428,7 +428,7 @@ Item { onValueModified: { if (colorButton.lightness !== lightnessSlider.value && !colorButton.block) { colorButton.lightness = lightnessSlider.value - colorButton.clicked() + colorButton.updateColor() } } } diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml index a1b5672ebb3..536877b58ed 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml @@ -626,7 +626,7 @@ Column { sliderMargins: 4 - onClicked: { + onUpdateColor: { colorEditor.color = colorButton.color if (contextMenu.opened) contextMenu.close()