diff options
author | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-04-14 18:17:15 +0200 |
---|---|---|
committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-04-20 17:10:02 +0000 |
commit | cfb64f00d67c88e345af7988988a27a858014a47 (patch) | |
tree | 14bf960558302389188e8aa84e38db7ac3f10b98 /src/plugins | |
parent | d223da63e2bedc47095b59e2f1ed319292fd1410 (diff) | |
download | qt-creator-cfb64f00d67c88e345af7988988a27a858014a47.tar.gz |
QmlDesigner: Add support for more AuxiliaryData in property editor
Change-Id: If5e5b7b52da991f6aa488715d99c36f4499696d8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp index 55ad0fb353..56202a2596 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp @@ -144,10 +144,17 @@ QVariant properDefaultAuxiliaryProperties(const QmlObjectNode &qmlObjectNode, if (node.hasAuxiliaryData(auxName)) return node.auxiliaryData(auxName); - - if (propertyName == "color") + if (propertyName == "transitionColor") + return QColor(Qt::red); + if (propertyName == "areaColor") + return QColor(Qt::red); + if (propertyName == "blockColor") + return QColor(Qt::red); + if (propertyName == "areaFillColor") + return QColor(Qt::transparent); + else if (propertyName == "color") return QColor(Qt::red); - if (propertyName == "fillColor") + else if (propertyName == "fillColor") return QColor(Qt::transparent); else if (propertyName == "width") return 4; @@ -233,6 +240,12 @@ void PropertyEditorQmlBackend::setupAuxiliaryProperties(const QmlObjectNode &qml propertyNames.append({"color", "width", "inOffset", "outOffset", "joinConnection"}); } else if (itemNode.isFlowActionArea()) { propertyNames.append({"color", "width", "fillColor", "outOffset", "dash"}); + } else if (itemNode.isFlowDecision()) { + propertyNames.append({"color", "width", "fillColor", "dash"}); + } else if (itemNode.isFlowWildcard()) { + propertyNames.append({"color", "width", "fillColor", "dash"}); + } else if (itemNode.isFlowView()) { + propertyNames.append({"transitionColor", "areaColor", "areaFillColor", "blockColor" }); } for (const PropertyName &propertyName : propertyNames) { |