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

QmlDesigner: Rename signal

Browse Source 
The name clicked is missleading.

Change-Id: I2782d1af5c0bd8a58c24729f043291b482cec6a8
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2020-03-31 16:15:17 +02:00
parent 247ffa0e1b
commit 7222df86d1
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorButton.qml
View File

@@ -41,7 +41,7 @@ Item {
property bool block: false property bool block: false
signal clicked signal updateColor
signal rightMouseButtonClicked signal rightMouseButtonClicked
onAlphaChanged: invalidateColor(); onAlphaChanged: invalidateColor();
@@ -216,7 +216,7 @@ Item {
} }
onReleased: { onReleased: {
if (mouse.button === Qt.LeftButton) if (mouse.button === Qt.LeftButton)
colorButton.clicked() colorButton.updateColor()
} }
acceptedButtons: Qt.LeftButton | Qt.RightButton acceptedButtons: Qt.LeftButton | Qt.RightButton
@@ -245,7 +245,7 @@ Item {
if (colorButton.hue !== value) if (colorButton.hue !== value)
colorButton.hue = value colorButton.hue = value
} }
onClicked: colorButton.clicked() onClicked: colorButton.updateColor()
} }
Row { Row {
@@ -278,7 +278,7 @@ Item {
var tmp = redSlider.value / 255.0 var tmp = redSlider.value / 255.0
if (colorButton.color.r !== tmp && !colorButton.block) { if (colorButton.color.r !== tmp && !colorButton.block) {
colorButton.color.r = tmp colorButton.color.r = tmp
colorButton.clicked() colorButton.updateColor()
} }
} }
} }
@@ -307,7 +307,7 @@ Item {
var tmp = greenSlider.value / 255.0 var tmp = greenSlider.value / 255.0
if (colorButton.color.g !== tmp && !colorButton.block) { if (colorButton.color.g !== tmp && !colorButton.block) {
colorButton.color.g = tmp colorButton.color.g = tmp
colorButton.clicked() colorButton.updateColor()
} }
} }
} }
@@ -336,7 +336,7 @@ Item {
var tmp = blueSlider.value / 255.0 var tmp = blueSlider.value / 255.0
if (colorButton.color.b !== tmp && !colorButton.block) { if (colorButton.color.b !== tmp && !colorButton.block) {
colorButton.color.b = tmp colorButton.color.b = tmp
colorButton.clicked() colorButton.updateColor()
} }
} }
} }
@@ -359,7 +359,7 @@ Item {
onValueModified: { onValueModified: {
if (colorButton.alpha !== alphaSlider.value && !colorButton.block) { if (colorButton.alpha !== alphaSlider.value && !colorButton.block) {
colorButton.alpha = alphaSlider.value colorButton.alpha = alphaSlider.value
colorButton.clicked() colorButton.updateColor()
} }
} }
} }
@@ -384,7 +384,7 @@ Item {
onValueModified: { onValueModified: {
if (colorButton.hue !== hueSlider2.value && !colorButton.block) { if (colorButton.hue !== hueSlider2.value && !colorButton.block) {
colorButton.hue = hueSlider2.value colorButton.hue = hueSlider2.value
colorButton.clicked() colorButton.updateColor()
} }
} }
} }
@@ -406,7 +406,7 @@ Item {
onValueModified: { onValueModified: {
if (colorButton.saturation !== saturationSlider.value && !colorButton.block) { if (colorButton.saturation !== saturationSlider.value && !colorButton.block) {
colorButton.saturation = saturationSlider.value colorButton.saturation = saturationSlider.value
colorButton.clicked() colorButton.updateColor()
} }
} }
} }
@@ -428,7 +428,7 @@ Item {
onValueModified: { onValueModified: {
if (colorButton.lightness !== lightnessSlider.value && !colorButton.block) { if (colorButton.lightness !== lightnessSlider.value && !colorButton.block) {
colorButton.lightness = lightnessSlider.value colorButton.lightness = lightnessSlider.value
colorButton.clicked() colorButton.updateColor()
} }
} }
} }

2
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditor.qml
View File

@@ -626,7 +626,7 @@ Column {
sliderMargins: 4 sliderMargins: 4
onClicked: { onUpdateColor: {
colorEditor.color = colorButton.color colorEditor.color = colorButton.color
if (contextMenu.opened) if (contextMenu.opened)
contextMenu.close() contextMenu.close()