From: Jiang Jiang <jiang.jiang@nokia.com>
Date: Thu, 12 Jan 2012 15:28:22 +0000 (+0100)
Subject: Fix preedit text visibility when TextInput is empty
X-Git-Tag: qt-v5.0.0-alpha1~688
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f9608630b9899dda3242f031fa4a4295d0a2e22;p=profile%2Fivi%2Fqtdeclarative.git

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>
---

diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 0ef3cd6..e569581 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,