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

QmlDesigner: Further reduce the direct dependecy on GradientLine

Browse Source 
Change-Id: I1c7d9b87f2b2c16393bd672fe80356aca8b6e2d3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
This commit is contained in:
Thomas Hartmann
2022-07-15 16:26:40 +02:00
parent 33a7de0c88
commit 89488d1cf1
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,14 +109,12 @@ SecondColumnLayout {
if (colorEditor.supportGradient && cePopup.gradientModel.hasGradient) {
var hexColor = convertColorToString(colorEditor.color)
hexTextField.text = hexColor
cePopup.popupHexTextField.text = hexColor
cePopup.gradientLine.currentColor = colorEditor.color
cePopup.commitGradientColor()
}
// Delay setting the color to keep ui responsive
if (cePopup.isNotInGradientMode())
colorEditorTimer.restart(
)
colorEditorTimer.restart()
}
Spacer {

22
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ColorEditorPopup.qml
View File

@@ -37,13 +37,19 @@ T.Popup {
property alias gradientLine: gradientLine
property alias popupHexTextField: popupHexTextField
property alias gradientPropertyName: cePopup.gradientLine.gradientPropertyName
property alias gradientPropertyName: cePopup.gradientModel.gradientPropertyName
property alias gradientOrientation: gradientOrientation
property alias gradientModel: gradientModel
property bool isInValidState: false
function commitGradientColor() {
var hexColor = convertColorToString(colorEditor.color)
cePopup.popupHexTextField.text = hexColor
cePopup.gradientLine.currentColor = colorEditor.color
}
function isNotInGradientMode() {
return ceMode.currentValue === "Solid"
}
@@ -123,7 +129,7 @@ T.Popup {
=== Gradient.Horizontal ? "Gradient.Horizontal" : "Gradient.Vertical"
gradientString += "orientation: " + orientation + ";"
for (var i = 0; i < cePopup.gradientLine.model.count; i++)
for (var i = 0; i < gradientModel.count; i++)
gradientString += "GradientStop {}"
gradientString += "}"
@@ -132,10 +138,10 @@ T.Popup {
gradientString, colorEditor.gradientThumbnail,
"dynamicGradient")
for (i = 0; i < cePopup.gradientLine.model.count; i++) {
gradientObject.stops[i].color = cePopup.gradientLine.model.getColor(
for (i = 0; i < gradientModel.count; i++) {
gradientObject.stops[i].color = gradientModel.getColor(
i)
gradientObject.stops[i].position = cePopup.gradientLine.model.getPosition(
gradientObject.stops[i].position = gradientModel.getPosition(
i)
}
@@ -166,10 +172,10 @@ T.Popup {
gradientStr, colorEditor.shapeGradientThumbnail,
"dynamicShapeGradient")
for (j = 0; j < cePopup.gradientLine.model.count; j++) {
gradientObj.stops[j].color = cePopup.gradientLine.model.getColor(
for (j = 0; j < gradientModel.count; j++) {
gradientObj.stops[j].color = gradientModel.getColor(
j)
gradientObj.stops[j].position = cePopup.gradientLine.model.getPosition(
gradientObj.stops[j].position = gradientModel.getPosition(
j)
}