summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativetext_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from ↵Yann Bodson2011-02-091-1/+1
| | | | | | | | | | master. - MultiplyHeight becomes ProportionalHeight - PixelHeight becomes FixedHeight Change-Id: I2a1ebc6ff9db7e62f513919f19773f985b08f8d7 Reviewed-by: Michael Brasser
* Add support for line spacing in Text element.Yann Bodson2011-01-281-0/+13
| | | | | | | This change adds the lineHeight and lineHeightMode properties. Task-number: QTBUG-14296 Reviewed-by: Martin Jones
* Add missing revisions for QtQuick 1.1 additionsMartin Jones2011-01-271-6/+6
| | | | | Task-number: QTBUG-15279 Reviewed-by: Michael Brasser
* Expose implicitWidth and implicitHeight properties of Item.Martin Jones2011-01-241-2/+2
| | | | | | | | 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/+1
|\
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | QDeclarativeText has new multiline propertiesChristopher Ham2011-01-141-0/+14
| | | | | | | | | | | | | | | | | | | | 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
* | Support for justification in Text and TextEdit elements.Yann Bodson2010-12-171-1/+2
|/ | | | | Task-number: QTBUG-13242 Reviewed-by: Michael Brasser
* Don't export QtDeclarative symbols needed by QtCreator on SymbianJoona Petrell2010-10-191-1/+3
| | | | | Task-number: QTBUG-14041 Reviewed-by: Aaron Kennedy
* Make declarative pixmap cache easier to useAaron Kennedy2010-07-051-3/+0
| | | | | | | | | | | | | | | | | 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
* Fix and better test Text / TextEdit alignments.Warwick Allison2010-06-231-0/+2
| | | | | | Various clipping and refresh bugs. Task-number: QTBUG-11492
* Fix TextEdit clipping when not wrapped. Rename most-useful-wrap-mode to "Wrap".Warwick Allison2010-05-261-1/+8
|
* Remove the deprecated wrap property.Martin Jones2010-04-221-3/+0
|
* Simplify dynamic resource loading to avoid cluttering Text API.Warwick Allison2010-04-151-3/+1
| | | | Task-number: QTBUG-9900 QT-3287
* Correctly resolve, and load, IMG tags in Text element.Warwick Allison2010-04-151-0/+7
| | | | | | Task-number: QTBUG-9900 Reviewed-by: Martin Jones
* Enable other wrapping modes.Martin Jones2010-04-091-3/+3
| | | | | | | | WrapAnywhere - Text can be wrapped at any point on a line, even if it occurs in the middle of a word. WrapAtWordBoundaryOrAnywhere - If possible, wrapping occurs at a word boundary; otherwise it will occur at the appropriate point on the line, even in the middle of a word.
* Replace Text::wrap property with Text::wrapMode enumeration.Martin Jones2010-04-081-2/+13
| | | | wrap remains for a little while, and will produce a warning.
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-0/+160
QDeclarativeXXX.