From 550d1d75740cda5be718b7ab36bb517ebb190439 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 15 Nov 2011 13:08:12 +0200 Subject: Fix alignment of non-wrapped richtext QML Text elements. QTextDocument needs to know the actual control width rather than the text width to be able to align the text to the control. Task-number: ou1cimx1#934687 Reviewed-by: Joona Petrell --- src/declarative/graphicsitems/qdeclarativetext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp index 20e4eef..684dc5a 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -289,7 +289,7 @@ void QDeclarativeTextPrivate::updateSize() doc->setTextWidth(-1); naturalWidth = doc->idealWidth(); } - if (wrapMode != QDeclarativeText::NoWrap && q->widthValid()) + if (q->widthValid()) doc->setTextWidth(q->width()); else doc->setTextWidth(doc->idealWidth()); // ### Text does not align if width is not set (QTextDoc bug) -- cgit v0.12