summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativetext.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Revert part of commit 7c1ab9b6a8Olivier Goffart2011-02-091-23/+0
| | | | | | | It was not properly merged in master because of conflicts, and we have now a public API for this Added QEXPECT_FAIL and opened QTBUG-17325
* Doc fix for lineHeight.Yann Bodson2011-01-281-1/+3
|
* Add support for line spacing in Text element.Yann Bodson2011-01-281-3/+81
| | | | | | | 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-6/+18
| | | | | | | | | 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
* Fix MaximumLineCount in Text and add testsChristopher Ham2011-01-281-24/+20
| | | | | | | | | Fixed MaximumLineCount not truncating when wrapMode was not set. Visual autotests were added to test various possible options for maximumLineCount. Task-number: QTBUG-12305 Reviewed-by: Michael Brasser
* Expose implicitWidth and implicitHeight properties of Item.Martin Jones2011-01-241-6/+56
| | | | | | | | 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-5/+14
|\
| * Request font sizes with only 0.5pt resolution.Martin Jones2011-01-181-4/+13
| | | | | | | | | | | | | | | | 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
* | Add lineCount property to QDeclarativeTextEditChristopher Ham2011-01-141-1/+1
| | | | | | | | | | | | | | | | The lineCount property should return the number of lines contained in textEdit. Also corrected minor documentation in Text Task-number: QTBUG-12305 Reviewed-by: Michael Brasser
* | QDeclarativeText has new multiline propertiesChristopher Ham2011-01-141-15/+164
| | | | | | | | | | | | | | | | | | | | 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-4/+7
|/ | | | | Task-number: QTBUG-13242 Reviewed-by: Michael Brasser
* Repaint when text color changesAlan Alpert2010-11-261-5/+6
| | | | | Task-number: QTBUG-15623 Reviewed-by: Yann Bodson
* Fix Text::elide docs.Bea Lam2010-11-091-1/+1
| | | | Reviewed-by: Michael Brasser
* Text alignment is broken with multi-line text and implicit size.Yann Bodson2010-11-081-12/+46
| | | | | | Also add some visual tests for multi-line text elememts. Task-number: QTBUG-15018
* Regression: QDeclarativeText does not update when text turns emptyYann Bodson2010-11-031-0/+1
| | | | | Task-number: QTBUG-14865 Reviewed-by: Michael Brasser
* Regression: Text element breaks when using \n for separating linesYann Bodson2010-11-021-12/+12
| | | | | Task-number: QTBUG-14915 Reviewed-by: Michael Brasser
* Regression: horizontal alignment bug with single line textYann Bodson2010-10-291-3/+3
| | | | Task-number: QTBUG-14841
* Update when text changes to ""Alan Alpert2010-10-291-1/+2
| | | | | | Also fixes a doc typo. Includes test. Task-number: QTBUG-14469
* Remove unnecessary layouting code from QDeclarativeTextYann Bodson2010-10-281-43/+8
| | | | | Task-number: QTBUG-14795 Reviewed-by: Michael Brasser
* Actually call update in the Text ElementAlan Alpert2010-10-151-0/+1
| | | | | Task-number: QTBUG-14469 Reviewed-by: Aaron Kennedy
* Recalculate Text Element's alignment when width changesAlan Alpert2010-10-151-3/+4
| | | | | Task-number: QTBUG-14463 Reviewed-by: Aaron Kennedy
* Fix alignment bugs in Text elementAaron Kennedy2010-10-131-456/+501
| | | | Task-number: QTBUG-14374
* Disable Text {} image caching by defaultAaron Kennedy2010-10-081-2/+2
| | | | Task-number: QTBUG-14050
* Fix clipping behavior for non-cached text.Michael Brasser2010-10-041-1/+1
|
* Apply the QStaticText text-caching strategy for QMLAaron Kennedy2010-10-011-12/+24
| | | | | | | | | | | | 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
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-091-10/+8
|\
| * Don't cause repaints during painting in Text elementMartin Jones2010-09-081-9/+7
| | | | | | | | | | | | | | | | | | | | Calling prepareGeometryChange in a paint event is a bad idea and was causing jerky scrolling. There is no longer any need for the removed code since we don't use imgCache.size() to determine boundingRect() anymore. Task-number: QTBUG-13453 Reviewed-by: Joona Petrell
| * Doc: Added types to method and signal documentation; other fixes.David Boddie2010-09-011-1/+1
| |
* | Clarified iterator semantic in documentation and added a code snippet to a ↵Jerome Pasion2010-08-311-0/+10
|/ | | | | | | QML signal handler. Reviewed by: David Boddie Tasks:QTBUG-13243, QTBUG-11779
* Remove pointless \internal docs (that contain no information)Aaron Kennedy2010-08-271-26/+0
|
* Alignment of shadow for rich text is broken when using text stylesYann Bodson2010-08-251-3/+3
| | | | Task-number: QTBUG-13142
* Fix few declarative code issues discovered by static code analysisJoona Petrell2010-08-241-1/+1
| | | | | Task-number: Reviewed-by: Aaron Kennedy
* qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-1/+2
| | | | ...and a set of functional group pages.
* Bounding rect of text was not always calculated correctly.Martin Jones2010-07-211-53/+27
| | | | | | | | The boundingRect depended upon the image cache which may not become valid until after boundingRect is called. Task-number: QTBUG-12291 Reviewed-by: Michael Brasser
* font.letterSpacing used percentage rather than absolute values.Martin Jones2010-07-211-2/+1
| | | | | | | ... and percentage is useless. Task-number: QTBUG-12282 Reviewed-by: Warwick Allison
* Ensure the boundingRect() of Text is correctly calculated.Michael Brasser2010-07-201-0/+2
| | | | | | | We need to create our cached image in boundingRect() if it doesn't already exist, to prevents painting errors. Reviewed-by: Warwick Allison
* Improve QML text rendering when LCD smoothing is enabled for OS X.Michael Brasser2010-07-191-0/+16
| | | | | | | | | | | | | Text in QML is always painted into a pixmap, and with sub-pixel antialiasing enabled this produced incorrect results. This patch is a temporary fix until QTBUG-12252 and/or QTBUG-7747 can be properly addressed in a patch release. In the worst case, if using QML and QPainters are being constructed in a non-GUI thread, this patch could potentially turn off sub-pixel antialiasing for them. Task-number: QTBUG-11002 Reviewed-by: Aaron Kennedy Reviewed-by: Eskil Abrahamsen Blomfeldt
* Text element does not clip even with clip=trueYann Bodson2010-07-151-7/+13
| | | | | Task: QTBUG-12201 Reviewed-by: Michael Brasser
* QDeclarativeText optimization.Michael Brasser2010-07-071-1/+3
| | | | | | updateSize() shouldn't trigger another updateSize(). Reviewed-by: Martin Jones
* Make Text, TextInput, and TextEdit all have the same size for the same text.Warwick Allison2010-07-071-0/+2
| | | | | | | | | | | | This may mean that the cursor is to the right of the width, so components should cater for that with a margin if they are boxed / clipped. TextInput used to try to account for right bearing (and left bearing incorrectly since it added it on the right). This is removed. Potentially this means that for some fonts the text repaints incorrectly on the left or right, but if that is the case Text and TextEdit already had such a problem (undetected), and all will need fixing. Task-number: QTBUG-11983
* Make declarative pixmap cache easier to useAaron Kennedy2010-07-051-63/+85
| | | | | | | | | | | | | | | | | 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
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-301-0/+2
|\
| * Docs - add more links to relevant examplesBea Lam2010-06-301-0/+2
| | | | | | | | Task-number: QTBUG-11754
* | Remove the old font.outline documentationMartin Jones2010-06-301-6/+2
|/ | | | | | | Text.style is the correct property, and this has never been available in TextInput or TextEdit. Task-number: QTBUG-11828
* Fix and better test Text / TextEdit alignments.Warwick Allison2010-06-231-50/+92
| | | | | | Various clipping and refresh bugs. Task-number: QTBUG-11492
* Minor doc fixesBea Lam2010-06-111-1/+1
|
* Doc improvements, including snippet fixes, linking to examples, makingBea Lam2010-06-111-10/+6
| | | | docs more consistent
* Add 'on' prefix to documentation of signalsBea Lam2010-06-101-1/+1
|
* Text should update when the alignment changes.Michael Brasser2010-06-021-0/+2
|
generated by cgit v0.12 at 2025-01-13 22:41:55 (GMT)