diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2011-11-03 16:34:47 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-04 03:53:04 +0100 |
| commit | 7db2027d2072a99680abee8d4e5cfaa62b1f3296 (patch) | |
| tree | aa5a68395c6278f741d086314ad1d389e8bf35d3 | |
| parent | 9b4e47f704d8dd6544290640c1670e003288b97f (diff) | |
Text.RichText ignores color property
Task-number: QTBUG-21921
Change-Id: I2adb9062e658742a704dc55b4def7f6f1eb1f954
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
| -rw-r--r-- | src/declarative/items/qquicktext.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/items/qquicktextnode.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/items/qquicktext.cpp b/src/declarative/items/qquicktext.cpp index 36d15c6a64..26f95438cb 100644 --- a/src/declarative/items/qquicktext.cpp +++ b/src/declarative/items/qquicktext.cpp @@ -1728,7 +1728,7 @@ QSGNode *QQuickText::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data if (d->richText) { d->ensureDoc(); - node->addTextDocument(bounds.topLeft(), d->doc, QColor(), d->style, d->styleColor); + node->addTextDocument(bounds.topLeft(), d->doc, d->color, d->style, d->styleColor); } else { node->addTextLayout(QPoint(0, bounds.y()), &d->layout, d->color, d->style, d->styleColor); diff --git a/src/declarative/items/qquicktextnode.cpp b/src/declarative/items/qquicktextnode.cpp index fab592ffdc..5cc372f9e1 100644 --- a/src/declarative/items/qquicktextnode.cpp +++ b/src/declarative/items/qquicktextnode.cpp @@ -1174,8 +1174,10 @@ void QQuickTextNode::addTextDocument(const QPointF &, QTextDocument *textDocumen } textPos += text.length(); } else { - if (!textColor.isValid()) + if (charFormat.foreground().style() != Qt::NoBrush) engine.setTextColor(charFormat.foreground().color()); + else + engine.setTextColor(textColor); int fragmentEnd = textPos + fragment.length(); if (preeditPosition >= 0 |