From ccc5039c22d2e507b61cf3fc3b9be9684638db12 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Wed, 20 May 2009 09:43:58 +1000
Subject: Don't recreate text layout everytime it is used.

---
 src/declarative/fx/qfxtext.cpp | 18 ++++++------------
 src/declarative/fx/qfxtext_p.h |  7 ++++++-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/declarative/fx/qfxtext.cpp b/src/declarative/fx/qfxtext.cpp
index bc3856d..e84255d 100644
--- a/src/declarative/fx/qfxtext.cpp
+++ b/src/declarative/fx/qfxtext.cpp
@@ -458,10 +458,11 @@ void QFxTextPrivate::updateSize()
                 singleline = !tmp.contains(QChar::LineSeparator);
                 if (singleline && elideMode != Qt::ElideNone && q->widthValid())
                     tmp = fm.elidedText(tmp,elideMode,q->width()); // XXX still worth layout...?
-                QTextLayout layout;
+                layout.clearLayout();
                 layout.setFont(f);
                 layout.setText(tmp);
                 size = setupTextLayout(&layout);
+                cachedLayoutSize = size;
             }
         if (richText) {
             singleline = false; // richtext can't elide or be optimized for single-line case
@@ -608,18 +609,11 @@ QImage QFxTextPrivate::wrappedTextImage(bool drawStyle)
     //do layout
     Q_Q(const QFxText);
     QFont f; if (_font) f = _font->font();
-    QString tmp = text;
-    if (singleline && elideMode != Qt::ElideNone && q->widthValid()) {
-        QFontMetrics fm(f);
-        tmp = fm.elidedText(tmp,elideMode,q->width()); // XXX still worth layout...?
-    }
-    tmp.replace(QLatin1Char('\n'), QChar::LineSeparator);
-    QTextLayout textLayout(tmp, f);
-    QSize size = setupTextLayout(&textLayout);
+    QSize size = cachedLayoutSize;
 
     int x = 0;
-    for (int i = 0; i < textLayout.lineCount(); ++i) {
-        QTextLine line = textLayout.lineAt(i);
+    for (int i = 0; i < layout.lineCount(); ++i) {
+        QTextLine line = layout.lineAt(i);
         if (hAlign == QFxText::AlignLeft) {
             x = 0;
         } else if (hAlign == QFxText::AlignRight) {
@@ -640,7 +634,7 @@ QImage QFxTextPrivate::wrappedTextImage(bool drawStyle)
     else 
         p.setPen(color);
     p.setFont(f);
-    textLayout.draw(&p, QPointF(0, 0));
+    layout.draw(&p, QPointF(0, 0));
     return img;
 }
 
diff --git a/src/declarative/fx/qfxtext_p.h b/src/declarative/fx/qfxtext_p.h
index 4296891..8bb3142 100644
--- a/src/declarative/fx/qfxtext_p.h
+++ b/src/declarative/fx/qfxtext_p.h
@@ -56,6 +56,7 @@
 #include "qfxitem.h"
 #include "qfxitem_p.h"
 #include "qml.h"
+#include <QtGui/qtextlayout.h>
 
 #if defined(QFX_RENDER_OPENGL)
 #include "gltexture.h"
@@ -72,7 +73,9 @@ class QFxTextPrivate : public QFxItemPrivate
     Q_DECLARE_PUBLIC(QFxText)
 public:
     QFxTextPrivate()
-      : _font(0), color((QRgb)0), style(QFxText::Normal), imgDirty(true), hAlign(QFxText::AlignLeft), vAlign(QFxText::AlignTop), elideMode(Qt::ElideNone), dirty(false), wrap(false), richText(false), singleline(false), control(0), doc(0)
+      : _font(0), color((QRgb)0), style(QFxText::Normal), imgDirty(true),
+        hAlign(QFxText::AlignLeft), vAlign(QFxText::AlignTop), elideMode(Qt::ElideNone),
+        dirty(false), wrap(false), richText(false), singleline(false), control(0), doc(0)
     {
     }
 
@@ -126,6 +129,8 @@ public:
     bool singleline;
     QTextControl *control;
     QTextDocument *doc;
+    QTextLayout layout;
+    QSize cachedLayoutSize;
 };
 
 QT_END_NAMESPACE
-- 
cgit v0.12