summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativetextedit.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-071-1/+3
|\ | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Dragging in nested views no longer works as expected Fix implicit height not growing when pre-edit text wraps. Fix leak in State element. Fix leak in bindings created by PropertyChanges.
| * Fix implicit height not growing when pre-edit text wraps.Andrew den Exter2011-09-061-1/+3
| | | | | | | | | | | | | | | | | | | | QTextDocument::isEmpty() doesn't account for pre-edit text so use the return value of size() to determine if implicitHeight should fall back to the font height instead. Change-Id: I028552a7646372b22894c45946a57ec4951b044a Task-number: QTBUG-21288 Reviewed-by: Martin Jones
* | Doc: Standardized on QtQuick for \since declarations.David Boddie2011-08-301-5/+5
|/ | | | | | (cherry picked from commit 609dc22f719ecb8d48349fd56f84960bbf46d731) Reapplied after bad v4.7.4 merge
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-08-241-5/+5
|\ | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
* \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-231-1/+10
|\ \ | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Doc: Fixing typo Fix left alignment of native RTL pre-edit text.
| * | Fix left alignment of native RTL pre-edit text.Andrew den Exter2011-08-231-1/+10
| |/ | | | | | | | | | | | | | | | | | | If there is no committed text in a TextInput or TextEdit determine if the pre-edit text is right to left before falling back to the global keyboard settings. Change-Id: I7e5568e936341602b8faf7be120f9a770c115f48 Task-number: QMLNG-72 Reviewed-by: Michael Brasser
* | Doc: Standardized on QtQuick for \since declarations.David Boddie2011-06-301-5/+5
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-271-6/+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-6/+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
* Fix TextEdit cursorRectangle property.Andrew den Exter2011-04-131-9/+6
| | | | | | | | | | | Translate the cursor rectangle from control coordinates to painting coordinates rather than the other way around, ensure the cursor delegate is also translated, and update the cursor rectangle, cursor delegate and micro focus when the preedit cursor changes position. Change-Id: Iac7a87f7fb965d5f56d059d8f4b97feef8b47789 Task-number: QTBUG-18515 QT-4827 Reviewed-by: Martin Jones
* Update QML "What's New" docs.Martin Jones2011-03-111-1/+1
| | | | Change-Id: I80d2247cd05ef71907bbf690e8e68a8860a65d4c
* Add missing header include missing from the previous commitJoona Petrell2011-03-091-0/+1
| | | | Change-Id: I7993c13c7fe43027caaa28ef3866df5f0d21f5b9
* Fix horizontal alignment of QTextDocument-based RTL textJoona Petrell2011-03-091-4/+3
| | | | | | | Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: If537d7c795dec46eedee62511e75bab862676ef1
* 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
* Merge branch '4.7' into qtquick11Joona Petrell2011-03-081-0/+1
|\
| * Set correct initial value for TextEdit and TextInput canPaste propertyYann Bodson2011-03-071-0/+1
| | | | | | | | | | | | Change-Id: Ied5b257305fa68db64fcf270ad2a42f691fbdca2 Task-number: QTBUG-17765 Reviewed-by: Martin Jones
* | Reverse horizontal alignment of QML editors when the layout mirroring is enabledJoona Petrell2011-03-071-26/+72
| | | | | | | | | | | | 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-3/+0
| | | | | | | | | | | | | | | | | | changes Task-number: QTBUG-15880 Reviewed-by: Martin Jones Change-Id: I1ea87b05c483e5c9339fc47cf719c22d001ef52b
* | 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
* | Add a way to query the reading direction of QML editor textJoona Petrell2011-03-031-0/+17
| | | | | | | | | | | | | | Task-number: QTBUG-17490 Reviewed-by: Martin Jones Change-Id: I3dd3854f820860d32e822605ed547150d5f17eb2
* | Merge branch '4.7' into qtquick11Martin Jones2011-03-011-28/+66
|\ \ | |/ | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativelistview.cpp Change-Id: Ic21311365c6139520ae337a379bdedb6ffe497db
| * Don't return positions within preedit text from positionAt().Andrew den Exter2011-03-011-0/+16
| | | | | | | | | | | | | | | | | | | | Preedit text isn't visible outside the inner workings of the Text elements so any position returned that is greater than the current cursor position is invalid. Change-Id: I433fc635dcd6d087bde13fc47a1a92e4222a3b2c Task-number: QTBUG-17834 Reviewed-by: Martin Jones
| * Add an is input method composing property to TextEdit and TextInput.Andrew den Exter2011-03-011-0/+24
| | | | | | | | | | | | | | | | | | | | | | Allows input handling to be disabled or changed while an input method is active. This might be used to allow mouse events through to the element or in conjunction with the cursor position to determine whether a click occurred on the preedit text. Change-Id: I35e148691920579c1d7c6f27b7e805d9551beadd Task-number: QTBUG-17835 Reviewed-by: Martin Jones
| * fix/improve docs for new QtQuick 1.1 attributesBea Lam2011-02-281-3/+3
| | | | | | | | | | | | | | | | | | 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 git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-221-4/+6
| |\ | | | | | | | | | | | | Conflicts: tools/qml/qml.pri
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-101-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: PathView items were not correctly updated when rootIndex changed. Allow text to selected in a TextEdit or TextInput inside a Flickable.
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-02-041-4/+6
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-10/+27
| | | |\ \
| | | * | | Doc: Fixed invalid/incomplete QML code snippets.David Boddie2011-01-171-4/+6
| | | | | |
| * | | | | Hide the TextInput/Edit cursor when the view doesn't have focus.Andrew den Exter2011-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only display a cursor if both the item and its scene have focus. Change-Id: I0c91ab4d533cd7d773ffc2489633e12c0d399ad9 Task-number: QTBUG-17365 Reviewed-by: Martin Jones
| * | | | | Forward mouse events from TextInput and TextEdit to QInputContext.Andrew den Exter2011-02-211-20/+16
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings TextInput in line with QLineEdit. The fix for TextEdit applies equally to QTextEdit. Change-Id: I5c47e5c8e951ee53cb1fe45d9c302050cd19deef Task-number: QTBUG-15705 Reviewed-by: axis
* | | | | Make sure horizontal QML editor text aligment always returns the actual ↵Joona Petrell2011-03-011-2/+50
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Allow text to selected in a TextEdit or TextInput inside a Flickable.Andrew den Exter2011-02-101-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Set keepMouseGrabs to true when the selectByMouse property is enabled to prevent flickable from stealing the mouse grab and interrupting a selection. Change-Id: I08e11265ab9c55d239fd09aceef4fdb8e74aba9d Task-number: QTBUG-16956 Reviewed-by: Martin Jones
* | | Don't accept input methods when a TextEdit or TextInput is read only.Andrew den Exter2011-02-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Neither would open a software input panel or allow text entry while read only, but on Symbian at least the text input mode indicator was still displayed giving the appearance of being able to enter text. Task-number: QT-4497 Reviewed-by: Damian Jansen
* | | Add a mouseSelectionMode property to TextEdit and TextInput.Andrew den Exter2011-02-011-31/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an option to do per word selection when selectByMouse is true. Also changes the selection behavior so that the first word selected remains selected when the direction of the selection changes which is more consistent with other implementations including the existing per word selection in QTextEdit. Task-number: QTBUG-16283 Reviewed-by: Martin Jones
* | | Expose implicitWidth and implicitHeight properties of Item.Martin Jones2011-01-241-8/+35
| | | | | | | | | | | | | | | | | | | | | | | | 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-11/+28
|\ \ \ | | |/ | |/|
| * | TextEdit implicit size varied depending upon wrapMode.Martin Jones2011-01-191-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | We failed to reset textWidth before calculating the ideal width of the text. Task-number: QTBUG-16710 Reviewed-by: Michael Brasser
| * | Request font sizes with only 0.5pt resolution.Martin Jones2011-01-181-8/+21
| |/ | | | | | | | | | | | | | | 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 canPaste property to TextInput and TextEditAlan Alpert2011-01-171-0/+28
| | | | | | | | | | Task-number: QTBUG-16190 Reviewed-by: Martin Jones
* | Add lineCount property to QDeclarativeTextEditChristopher Ham2011-01-141-0/+33
| | | | | | | | | | | | | | | | 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
* | Disable dragging text in TextEdit.Andrew den Exter2011-01-111-0/+1
| | | | | | | | | | | | | | | | Add a dragEnabled property to QTextControl so text dragging can optionally be disabled. Task-number: QTBUG-16248 Reviewed-by: Martin Jones
* | Add selection modes to TextEdit and TextInput.Andrew den Exter2011-01-101-9/+80
| | | | | | | | | | | | | | | | | | Add an overload for moveCursorSelection which takes a parameter specifying whether to update the selection with individual characters or whole words. Task-number: QTBUG-16283 Reviewed-by: Martin Jones
* | Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-071-3/+13
|\ \
| * | Add linkActivated signal to TextEditAlan Alpert2011-01-071-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | Since TextEdit can also contain rich text with anchors, it should also have a linkActivated signal like Text does. Task-number: QTBUG-15283 Reviewed-by: Martin Jones
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-071-0/+2
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
| * Setting TextInput.cursorPosition outside bounds crashed.Martin Jones2010-12-201-0/+2
| | | | | | | | | | | | | | Check bounds in TextInput and TextEdit. Task-number: QTBUG-16188 Reviewed-by: Bea Lam
| * Revert a fix made for bug QTBUG-15341Joona Petrell2010-12-141-14/+0
| | | | | | | | Reverted a commit 2eee49127b80b5b56c605f76ccea004b03d89577 "Remove active selection when TextEdit loses focus". Contrary to TextInput, by default TextEdit keeps the selection visible when the editor loses active focus. If this is not wanted, a property called persistentSelection can be set false to make selection dependant on the focus.
generated by cgit v0.12 at 2024-10-26 06:36:25 (GMT)