summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativetext_p_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Update licenseheader text in source filesJyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Elide has unexpected effect on Text's implicitWidthMartin Jones2011-04-211-0/+1
| | | | | | | | | The elided string was used to calculate the implicitWidth rather than the full string. Change-Id: I51b8800b47d4e32f4d5eef07c71df10e2df905b7 Task-number: QTBUG-18627 Reviewed-by: Michael Brasser
* Fix horizontal alignment of QTextDocument-based RTL textJoona Petrell2011-03-091-0/+2
| | | | | | | Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: If537d7c795dec46eedee62511e75bab862676ef1
* Use the text layout bounds calculated by QLayout.Martin Jones2011-03-081-2/+2
| | | | | | | | | We used to calculate the size and position of the cache image ourselves. Rather use the line positions and bounding rect calculated by QLayout. Change-Id: I601688ab7e310b0015a1994adf52b108f39504d8 Reviewed-by: Joona Petrell
* Reverse horizontal alignment of QML editors when the layout mirroring is enabledJoona Petrell2011-03-071-1/+3
| | | | | | Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: Ie9cebd7bc6d40f5f555bfd83ddc3a24a55c6cb4d
* Make sure horizontal QML editor text aligment always returns the actual ↵Joona Petrell2011-03-011-0/+2
| | | | | | | | | | | alignment Also, implicit empty text alignment now follows the Application's default layout direction traditionally set by the locale. Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: I88340513d489290bafd393072786a19731097b77
* Add support for line spacing in Text element.Yann Bodson2011-01-281-0/+2
| | | | | | | This change adds the lineHeight and lineHeightMode properties. Task-number: QTBUG-14296 Reviewed-by: Martin Jones
* Fixing right-to-left text in Text and TextInputChristopher Ham2011-01-281-1/+1
| | | | | | | | | The Text and TextInput items should now automatically flip the alignment of right-to-left text. Autotests also added to ensure the text is on the correct side (added for TextInput also). Task-number: QTBUG-15880 Reviewed-by: Martin Jones
* Expose implicitWidth and implicitHeight properties of Item.Martin Jones2011-01-241-3/+6
| | | | | | | | Overridden as readonly for elements that have an inherent implicit size such as Text, TextEdit, TextInput, positioners, Loader. Task-number: QTBUG-14957 Reviewed-by: Michael Brasser
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191-1/+2
|\
| * Request font sizes with only 0.5pt resolution.Martin Jones2011-01-181-0/+1
| | | | | | | | | | | | | | | | When animating pointSize avoid generating a huge number of fonts with slightly different point sizes. Task-number: QTBUG-13960 Reviewed-by: Aaron Kennedy
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | QDeclarativeText has new multiline propertiesChristopher Ham2011-01-141-0/+7
|/ | | | | | | | | | LineCount should return the number of lines currently being displayed. Setting maximumLineCount limits the number of lines that will be shown Truncated will return true if the text has been elided normally, or if the lines have been limited due to maximumLineCount. Task-number: QTBUG-12305 Reviewed-by: Michael Brasser
* Fix alignment bugs in Text elementAaron Kennedy2010-10-131-25/+23
| | | | Task-number: QTBUG-14374
* Fix clipping behavior for non-cached text.Michael Brasser2010-10-041-1/+0
|
* Apply the QStaticText text-caching strategy for QMLAaron Kennedy2010-10-011-14/+5
| | | | | | | | | | | | QML cannot use QStaticText directly as it doesn't support caching a QTextLayout. QDeclarativeTextLayout is basically a copy of QStaticText that adds this support. Currently this feature is disabled by default (enable with QML_DISABLE_IMAGE_CACHE=1) while we double check the perf consequences of this change. Task-number: QTBUG-14050
* QDeclarativeText optimization.Michael Brasser2010-07-071-1/+2
| | | | | | updateSize() shouldn't trigger another updateSize(). Reviewed-by: Martin Jones
* Make declarative pixmap cache easier to useAaron Kennedy2010-07-051-0/+4
| | | | | | | | | | | | | | | | | The QDeclarativePixmapCache was both slow, and very trickey to use correctly. Many QML elements did not correctly cancel outstanding requests, which leads to pixmaps leaking indefinately. Other elements, such as Text, were subject to race conditions that meant they may never actually load all their images. QDeclarativePixmap is a single class than encapsulates the action of fetching a pixmap, as well as the pixmap itself and the responsibility of canceling outstanding requests. Rather than relying on Qt's pixmap cache that doesn't cache all the information QML needs, QDeclarativePixmap implements its own cache, that correctly degrades over time (unlike QPixmapCache that can stop expiring items in some conditions). Reviewed-by: Warwick Allison
* Correctly resolve, and load, IMG tags in Text element.Warwick Allison2010-04-151-2/+3
| | | | | | Task-number: QTBUG-9900 Reviewed-by: Martin Jones
* Replace Text::wrap property with Text::wrapMode enumeration.Martin Jones2010-04-081-3/+3
| | | | wrap remains for a little while, and will produce a warning.
* Update #include of private headers in QtDeclarativeThiago Macieira2010-04-021-1/+1
| | | | | Always use private/. The WinSCW compiler doesn't search the current directory, for whatever reason.
* Optimize Rectangle, Image, and Text creation.Michael Brasser2010-03-081-4/+6
|
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-0/+127
QDeclarativeXXX.