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

QmlDesigner: Allow defining default colors in FlowView

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

33
src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp
View File

@@ -585,6 +585,9 @@ void FormEditorFlowActionItem::paint(QPainter *painter, const QStyleOptionGraphi
QColor flowColor = "#e71919";
if (qmlItemNode().rootModelNode().hasAuxiliaryData("areaColor"))
flowColor = qmlItemNode().rootModelNode().auxiliaryData("areaColor").value<QColor>();
if (qmlItemNode().modelNode().hasAuxiliaryData("color"))
flowColor = qmlItemNode().modelNode().auxiliaryData("color").value<QColor>();
@@ -600,7 +603,6 @@ void FormEditorFlowActionItem::paint(QPainter *painter, const QStyleOptionGraphi
if (qmlItemNode().modelNode().hasAuxiliaryData("dash"))
dash = qmlItemNode().modelNode().auxiliaryData("dash").toBool();
pen.setColor(flowColor);
if (dash)
pen.setStyle(Qt::DashLine);
@@ -611,11 +613,16 @@ void FormEditorFlowActionItem::paint(QPainter *painter, const QStyleOptionGraphi
pen.setCosmetic(true);
painter->setPen(pen);
if (qmlItemNode().modelNode().hasAuxiliaryData("fillColor")) {
QColor fillColor = QColor(Qt::transparent);
const QColor fillColor = qmlItemNode().modelNode().auxiliaryData("fillColor").value<QColor>();
painter->fillRect(boundingRect(), fillColor);
}
if (qmlItemNode().rootModelNode().hasAuxiliaryData("areaFillColor"))
fillColor = qmlItemNode().rootModelNode().auxiliaryData("areaFillColor").value<QColor>();
if (qmlItemNode().modelNode().hasAuxiliaryData("fillColor"))
fillColor = qmlItemNode().modelNode().auxiliaryData("fillColor").value<QColor>();
if (fillColor.alpha() > 0)
painter->fillRect(boundingRect(), fillColor);
painter->drawRect(boundingRect());
@@ -1046,6 +1053,9 @@ void FormEditorTransitionItem::paint(QPainter *painter, const QStyleOptionGraphi
bool dash = false;
if (qmlItemNode().rootModelNode().hasAuxiliaryData("transitionColor"))
color = qmlItemNode().rootModelNode().auxiliaryData("transitionColor").value<QColor>();
if (qmlItemNode().modelNode().hasAuxiliaryData("color"))
color = qmlItemNode().modelNode().auxiliaryData("color").value<QColor>();
@@ -1137,6 +1147,9 @@ void FormEditorFlowDecisionItem::paint(QPainter *painter, const QStyleOptionGrap
QColor flowColor = "#e71919";
if (qmlItemNode().rootModelNode().hasAuxiliaryData("blockColor"))
flowColor = qmlItemNode().rootModelNode().auxiliaryData("blockColor").value<QColor>();
if (qmlItemNode().modelNode().hasAuxiliaryData("color"))
flowColor = qmlItemNode().modelNode().auxiliaryData("color").value<QColor>();
@@ -1161,11 +1174,13 @@ void FormEditorFlowDecisionItem::paint(QPainter *painter, const QStyleOptionGrap
pen.setCosmetic(true);
painter->setPen(pen);
if (qmlItemNode().modelNode().hasAuxiliaryData("fillColor")) {
QColor fillColor = QColor(Qt::transparent);
const QColor fillColor = qmlItemNode().modelNode().auxiliaryData("fillColor").value<QColor>();
painter->fillRect(boundingRect(), fillColor);
}
if (qmlItemNode().modelNode().hasAuxiliaryData("fillColor"))
fillColor = qmlItemNode().modelNode().auxiliaryData("fillColor").value<QColor>();
if (fillColor.alpha() > 0)
painter->fillRect(boundingRect(), fillColor);
painter->drawLine(boundingRect().left(), boundingRect().center().y(),
boundingRect().center().x(), boundingRect().top());