diff options
| author | Eskil Abrahamsen Blomfeldt <eblomfel@trolltech.com> | 2009-08-05 13:33:08 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-01-14 12:49:09 (GMT) |
| commit | 135dcf11efe11dacb15f4c384b302d99a0470320 (patch) | |
| tree | 71f3f18bd34013313bef94856b314d3fb2e69ffe /src/gui/text/qstatictext_p.h | |
| parent | 4cfca7cf456722ee8659b595f231f3cc2033b80d (diff) | |
| download | Qt-135dcf11efe11dacb15f4c384b302d99a0470320.zip Qt-135dcf11efe11dacb15f4c384b302d99a0470320.tar.gz Qt-135dcf11efe11dacb15f4c384b302d99a0470320.tar.bz2 | |
Support maximumSize for the layout of the text in a QStaticText
Put back maximumSize property in QStaticText to allow matching calls
to drawText with a target rectangle. Implementation is done by
having a dummy paint engine which records the calls to drawTextItem()
and storing these, then replaying them later.
Diffstat (limited to 'src/gui/text/qstatictext_p.h')
| -rw-r--r-- | src/gui/text/qstatictext_p.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/gui/text/qstatictext_p.h b/src/gui/text/qstatictext_p.h index a0d16d4..f5fd8d3 100644 --- a/src/gui/text/qstatictext_p.h +++ b/src/gui/text/qstatictext_p.h @@ -55,7 +55,7 @@ #include <private/qtextengine_p.h> -QT_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE class QStaticText; class QStaticTextPrivate @@ -68,10 +68,15 @@ public: void init(); QAtomicInt ref; - QTextItemInt *items; - int itemCount; + QString text; QFont font; + QSizeF size; + + QTextItemInt *items; + QPointF *itemPositions; + int itemCount; + char *glyphLayoutMemory; unsigned short *logClusterMemory; |