summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativetext.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Standardized on QtQuick for \since declarations.David Boddie2011-06-301-4/+4
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-271-7/+2
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalAlignment and anchors.mirror properties
| * Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, ↵Joona Petrell2011-05-271-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effectiveHorizontalAlignment and anchors.mirror properties * these properties are seldomly used * they confuse developers that do not care about right-to-left user interfaces * LayoutMirroring.enabled property can be used instead to determine if mirroring is enabled * if needed, you can easily determine the effective layout directions and alignments with a little bit of JavaScript: function effectiveLayoutDirection() { if (LayoutMirroring.enabled) return (listView.layoutDirection == Qt.LeftToRight) ? Qt.RightToLeft : Qt.LeftToRight; else return listView.layoutDirection; } Task-number: QTBUG-11042 Reviewed-by: Martin Jones
* | 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-5/+18
| | | | | | | | | 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
* Text bounding rect calculated incorrectly if non-top aligned.Martin Jones2011-03-211-2/+2
| | | | | | | | | | QRect::setY() affects the size of the rectangle, so the height of the bounding rect was too small. Use moveTop() instead, which does not affect the size of the rectangle. Change-Id: If41ba6a28c9a7370f054dab20995a198f822ae2b Task-number: QTBUG-18194 Reviewed-by: Bea Lam
* Fix horizontal alignment of QTextDocument-based RTL textJoona Petrell2011-03-091-14/+31
| | | | | | | Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: If537d7c795dec46eedee62511e75bab862676ef1
* Revert to previous lineHeight behavior.Martin Jones2011-03-091-0/+1
| | | | | | | | | | f47f01fd34d08f6152c9053c0d6928fc359aa0f9 changed the height of the Text to not include the extra spacing at the end of the block. This is different to what QDextDocument does. Revert back to the old behavior. Change-Id: Ie43dea4dd5a0e9ba179f44c246fb834322db11e3 Reviewed-by: Joona Petrell
* Use the text layout bounds calculated by QLayout.Martin Jones2011-03-081-45/+28
| | | | | | | | | 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
* Base empty QML editor horizontal alignment on ↵Joona Petrell2011-03-081-1/+2
| | | | | | | | | QApplication::keyboardInputDirection() Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: I240d53c8572fd3d1222b555e93812a3ee38e2558
* Reverse horizontal alignment of QML editors when the layout mirroring is enabledJoona Petrell2011-03-071-29/+66
| | | | | | Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: Ie9cebd7bc6d40f5f555bfd83ddc3a24a55c6cb4d
* Removal of text alignment layout direction dependency was missing couple of ↵Joona Petrell2011-03-041-2/+0
| | | | | | | | | changes Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: I1ea87b05c483e5c9339fc47cf719c22d001ef52b
* Fix RTL multiline Text drawingMartin Jones2011-03-041-55/+20
| | | | | | | | | | We handled horizontal alignment ourselves, but this neglected some RTL layouting issues (e.g. trailing spaces). Allow QTextLayout to do the aligning for us. Also fix eliding of multiline text for RTL language - in this case the eliding should be to the left. Change-Id: I487137b123ae66c1f5fc358a8d8a013049d05818 Reviewed-by: Joona Petrell
* Remove text alignment of empty QML editors following the layout directionJoona Petrell2011-03-041-4/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-15880 Reviewed-by: Martin Jones Removed implicit text alignment of empty text in QML editor following the application's default layout direction. Change was originally made few days ago in the commit 88253db8a7d7910e1393b1948fb3747117538c92. Aligning empty and neutral text to the right for RTL locales requires much more comprehensive changes to the Qt's internal text classes than initially thought. Change-Id: I93a26df259b87dff47d57423949270656746c9a7
* Merge branch '4.7' into qtquick11Martin Jones2011-03-011-7/+32
|\ | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativelistview.cpp Change-Id: Ic21311365c6139520ae337a379bdedb6ffe497db
| * fix/improve docs for new QtQuick 1.1 attributesBea Lam2011-02-281-0/+4
| | | | | | | | | | | | | | | | | | Ensure attributes added in QtQuick 1.1 are marked with the '\since QtQuick 1.1' tag. Also add links to items listed in the QtQuick 1.1 section in whatsnew.qdoc. Task-number: QTBUG-17771 Change-Id: Ic8fb3c8d3c99a1469c1767779efaafd27ef460e1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-091-5/+7
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix auto test failure. PathView regression: dragging the path didn't update currentIndex Fix docs for variant and list basic types Add test for importing plugins that contain QML files Call onAdd() for first items added to ListView and GridView Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from master. Don't clear pre-edit text when a graphics items loses focus.
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-02-041-7/+28
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (216 commits) Doc: Fixed a reference to the wrong image. Fixed a bug that caused marked up inline text to be truncated. Doc: Renamed an image to ensure that it does not clash with another. Doc: Fixed QML, unindented snippet. Doc: Removed unnecessary HTML entity from the title. Doc: Fixed broken links to the old Symbian Foundation Wiki. Doc: Updated the copyright statements in the templates. Doc: Fixing typo Replace all occurances of "Qt 4.7" with "QtQuick 1.0" Doc: Adjusted the font sizes for the offline documentation. Doc: Added a missing style sheet to the qhp manifest. Doc: Fixed the qthelp namespace for the Qt documentation. Doc: including missing pages in overviews. Doc: Fixed typo in QCoreApplication docs Fixed whitespace. Avoid hard-coding product names in page titles. Doc: Unindented a code snippet. Doc: Fixed confusing wording of a sentence. Doc: Fixed a broken link. Doc: Updated the information about commercial editions of Qt. ...
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-261-4/+13
| | |\ \
| | * | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-241-7/+28
| | | | |
* | | | | Make sure horizontal QML editor text aligment always returns the actual ↵Joona Petrell2011-03-011-22/+45
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from ↵Yann Bodson2011-02-091-5/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | master. - MultiplyHeight becomes ProportionalHeight - PixelHeight becomes FixedHeight Change-Id: I2a1ebc6ff9db7e62f513919f19773f985b08f8d7 Reviewed-by: Michael Brasser
* | | 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
| |
generated by cgit v0.12 at 2024-11-16 22:33:47 (GMT)