aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJiang Jiang <jiang.jiang@nokia.com>2012-01-12 16:28:22 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-12 17:34:09 +0100
commit2f9608630b9899dda3242f031fa4a4295d0a2e22 (patch)
treed947f9d36b9d552c4d6ec5cfb96b840f56321d59 /src
parent4ca1f3ab96b6446bfc8277a6152e8bbca5815f44 (diff)
Fix preedit text visibility when TextInput is empty
Task-number: QTBUG-22646 Change-Id: I5162ffdebdee6f956a9a79b2307a2ac53cc4890b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/quick/items/qquicktextinput.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 0ef3cd66d3..e569581163 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -1625,7 +1625,7 @@ QSGNode *QQuickTextInput::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
offset = -QPoint(d->hscroll, d->vscroll);
}
- if (!d->m_textLayout.text().isEmpty()) {
+ if (!d->m_textLayout.text().isEmpty() || !d->m_textLayout.preeditAreaText().isEmpty()) {
node->addTextLayout(offset, &d->m_textLayout, d->color,
QQuickText::Normal, QColor(),
d->selectionColor, d->selectedTextColor,