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

Refactor label drawing

Browse Source 
Change-Id: Id95721b13454f0062a144263b1c518402a556e5f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Kama Wójcik
2020-12-22 12:30:37 +01:00
committed by Thomas Hartmann
parent 8ba1aa4025
commit a04f5ce3ea
2 changed files with 21 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -888,6 +888,7 @@ public:
, labelFlags(Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextDontClip) , labelFlags(Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextDontClip)
, labelFlipSide(false) , labelFlipSide(false)
, hitTesting(hitTest) , hitTesting(hitTest)
, isSelected(false)
, events() , events()
{ {
// width // width
@@ -1416,37 +1417,7 @@ void FormEditorTransitionItem::updateGeometry()
overallBoundingRect = overallBoundingRect.united(connection.fromRect); overallBoundingRect = overallBoundingRect.united(connection.fromRect);
overallBoundingRect = overallBoundingRect.united(connection.toRect); overallBoundingRect = overallBoundingRect.united(connection.toRect);
overallBoundingRect = overallBoundingRect.united(pathBoundingRect); overallBoundingRect = overallBoundingRect.united(pathBoundingRect);
drawLabels(&localPainter, connection);
// Calculate bounding rect for label
// TODO The calculation should be put into a separate function to avoid code duplication as this
// can also be found in drawLabel()
if (!connection.config.label.isEmpty()) {
const qreal percent = connection.config.labelPosition / 100.0;
const QPointF pos = connection.path.pointAtPercent(percent);
const qreal angle = connection.path.angleAtPercent(percent);
QLineF tmp(pos, QPointF(10, 10));
tmp.setLength(connection.config.labelOffset);
tmp.setAngle(angle + (connection.config.labelFlipSide ? 270 : 90));
QRectF textRect(0, 0, 100, 50);
textRect.moveCenter(tmp.p2());
QRectF labelRect;
QTransform transform;
transform.translate(textRect.center().x(), textRect.center().y());
transform.rotate(-normalizeAngle(angle));
transform.translate(-textRect.center().x(), -textRect.center().y());
localPainter.setTransform(transform);
localPainter.drawText(textRect,
connection.config.labelFlags,
connection.config.label,
&labelRect);
QRectF labelBoundingBox = transform.mapRect(labelRect);
overallBoundingRect = overallBoundingRect.united(labelBoundingBox);
}
} }
} }
@@ -1461,7 +1432,7 @@ QPointF FormEditorTransitionItem::instancePosition() const
return qmlItemNode().flowPosition(); return qmlItemNode().flowPosition();
} }
static void drawLabel(QPainter *painter, const Connection &connection) void FormEditorTransitionItem::drawLabels(QPainter *painter, const Connection &connection)
{ {
// draw label with event ids // draw label with event ids
if (connection.config.isSelected && !connection.config.events.isEmpty()) if (connection.config.isSelected && !connection.config.events.isEmpty())
@@ -1469,27 +1440,23 @@ static void drawLabel(QPainter *painter, const Connection &connection)
qreal offset = connection.config.labelOffset; qreal offset = connection.config.labelOffset;
QStringList events = connection.config.events.split(','); QStringList events = connection.config.events.split(',');
int fontSize = connection.config.fontSize; int fontSize = connection.config.fontSize;
QString output = events[0].trimmed(); QString outputText;
qreal minWidth = offset * 12; qreal minWidth = offset * 12.0;
int letterWidth = fontSize * 0.6; // assumption on max letter length qreal letterWidth = fontSize * 0.6; // assumption on max letter width
if (minWidth < output.size() * letterWidth) minWidth = output.size() * letterWidth;
int eventCount = events.size(); int eventCount = events.size();
for (int i = 1; i < eventCount; ++i) std::for_each(events.begin(), events.end(), [&](auto id) {
{ outputText.append(id.trimmed());
output.append('\n'); outputText.append('\n');
QString id = events[i].trimmed();
output.append(id);
if (minWidth < id.size() * letterWidth) minWidth = id.size() * letterWidth; if (minWidth < id.size() * letterWidth) minWidth = id.size() * letterWidth;
} });
const QPointF pos = connection.path.pointAtPercent(0.0); const QPointF pos = connection.path.pointAtPercent(0.0);
painter->save(); painter->save();
painter->setBrush(QColor(70, 70, 70, 200)); painter->setBrush(QColor(70, 70, 70, 200));
painter->setPen(Qt::lightGray); painter->setPen(Qt::lightGray);
painter->drawRoundedRect(pos.x(), pos.y() + offset, minWidth, 1.5 * fontSize * eventCount + offset * 4.0, offset / 2.0, offset / 2.0);
painter->drawRoundedRect(pos.x(), pos.y() + offset, minWidth, 1.5 * fontSize * eventCount + offset * 4, offset / 2, offset / 2); painter->drawText(pos.x(), pos.y() + 2.0 * offset, minWidth, offset * 2.0, Qt::AlignHCenter, QObject::tr("Connected Events"));
painter->drawText(pos.x(), pos.y() + 2 * offset, minWidth, offset * 2, Qt::AlignHCenter, QObject::tr("Connected Events")); painter->drawLine(pos.x() + offset, pos.y() + 4.0 * offset, pos.x() + minWidth - offset, pos.y() + offset * 4.0);
painter->drawLine(pos.x() + offset, pos.y() + 4 * offset, pos.x() + minWidth - offset, pos.y() + offset * 4); painter->drawText(pos.x() + offset, pos.y() + 4.0 * offset, minWidth - offset, 1.5 * fontSize * eventCount, Qt::AlignLeft, outputText);
painter->drawText(pos.x() + offset, pos.y() + 4 * offset, minWidth - offset, 1.5 * fontSize * eventCount, Qt::AlignLeft, output);
painter->restore(); painter->restore();
} }
if (connection.config.label.isEmpty()) if (connection.config.label.isEmpty())
@@ -1534,7 +1501,7 @@ static void drawArrow(QPainter *painter,
painter->restore(); painter->restore();
} }
static void paintConnection(QPainter *painter, const Connection &connection) void FormEditorTransitionItem::paintConnection(QPainter *painter, const Connection &connection)
{ {
const int arrowLength = 4 * connection.config.adjustedWidth; const int arrowLength = 4 * connection.config.adjustedWidth;
const int arrowWidth = 8 * connection.config.adjustedWidth; const int arrowWidth = 8 * connection.config.adjustedWidth;
@@ -1586,8 +1553,8 @@ static void paintConnection(QPainter *painter, const Connection &connection)
painter->drawEllipse(connection.start, arrowLength / 3, arrowLength / 3); painter->drawEllipse(connection.start, arrowLength / 3, arrowLength / 3);
} }
// Draw label // Draw labels
drawLabel(painter, connection); drawLabels(painter, connection);
painter->restore(); painter->restore();
} }

4
src/plugins/qmldesigner/components/formeditor/formeditoritem.h
View File

@@ -40,6 +40,7 @@ namespace QmlDesigner {
class FormEditorScene; class FormEditorScene;
class FormEditorView; class FormEditorView;
class AbstractFormEditorTool; class AbstractFormEditorTool;
class Connection;
namespace Internal { namespace Internal {
class GraphicItemResizer; class GraphicItemResizer;
@@ -197,11 +198,12 @@ public:
QPointF instancePosition() const override; QPointF instancePosition() const override;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override;
bool flowHitTest(const QPointF &point) const override; bool flowHitTest(const QPointF &point) const override;
protected: protected:
FormEditorTransitionItem(const QmlItemNode &qmlItemNode, FormEditorScene *scene) FormEditorTransitionItem(const QmlItemNode &qmlItemNode, FormEditorScene *scene)
: FormEditorItem(qmlItemNode, scene) : FormEditorItem(qmlItemNode, scene)
{} {}
void paintConnection(QPainter *painter, const Connection &connection);
void drawLabels(QPainter *painter, const Connection &connection);
private: private:
mutable bool m_hitTest = false; mutable bool m_hitTest = false;
}; };