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

QmlDesigner: Fix issue with gradient editing

Browse Source 
The gradient only has to be deleted if we are in gradient editing mode.
If we are not in gradient editing mode, we should not delete any gradient.

This was creating issues when editing border.color.

Task-number: QDS-675
Change-Id: Ie3fcbc4a817cb0062e895298d42794b7338084d6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2019-05-21 11:49:39 +02:00
parent cb71f6ec5f
commit bd2aa8ada3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,7 @@ Column {
} }
onHasGradientChanged: { onHasGradientChanged: {
if (!supportGradient) if (!colorEditor.supportGradient)
return return
if (gradientLine.hasGradient) { if (gradientLine.hasGradient) {
@@ -217,7 +217,9 @@ Column {
iconSource: "images/icon_color_solid.png" iconSource: "images/icon_color_solid.png"
onClicked: { onClicked: {
gradientLine.deleteGradient() if (colorEditor.supportGradient)
gradientLine.deleteGradient()
textField.text = colorEditor.color textField.text = colorEditor.color
colorEditor.backendValue.resetValue() colorEditor.backendValue.resetValue()
} }
@@ -472,7 +474,8 @@ Column {
iconSource: "images/icon_color_none.png" iconSource: "images/icon_color_none.png"
onClicked: { onClicked: {
colorEditor.color = "#00000000" colorEditor.color = "#00000000"
gradientLine.deleteGradient() if (colorEditor.supportGradient)
gradientLine.deleteGradient()
} }
tooltip: qsTr("Transparent") tooltip: qsTr("Transparent")
} }