From 43db14d83279566cdd5626321251efc5da8acc1d Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Wed, 12 May 2010 11:06:55 +1000
Subject: Correctly resize TextInput in the presence of preedit text.

Task-number: QTBUG-10466
Reviewed-by: alexis
---
 src/declarative/graphicsitems/qdeclarativetextinput.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 604f508..4d89887 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -1233,9 +1233,7 @@ void QDeclarativeTextInput::updateSize(bool needsRedraw)
     int cursorWidth = d->control->cursorWidth();
     if(d->cursorItem)
         cursorWidth = d->cursorItem->width();
-    //### Is QFontMetrics too slow?
-    QFontMetricsF fm(d->font);
-    setImplicitWidth(fm.width(d->control->displayText())+cursorWidth);
+    setImplicitWidth(d->control->naturalTextWidth() + cursorWidth);
     setContentsSize(QSize(width(), height()));//Repaints if changed
     if(w==width() && h==height() && needsRedraw){
         clearCache();
-- 
cgit v0.12