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

QmlDesigner: Add support for more AuxiliaryData in property editor

Browse Source 
Change-Id: If5e5b7b52da991f6aa488715d99c36f4499696d8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2020-04-14 18:17:15 +02:00
parent d223da63e2
commit cfb64f00d6
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
View File

@@ -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 == "fillColor")
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);
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) {