aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/TextArea.qml
Commit message (Collapse)AuthorAgeFilesLines
* Allow attaching TextArea to a FlickableJ-P Nurmi2016-04-261-1/+2
| | | | | | | | | | | | | It is not always possible to let TextArea grow infinitely, but in some cases it should be scrollable on its own. Even though it is not a built-in feature of TextArea like in Qt Quick Controls 1, this change makes it straight-forward to attach TextArea to a Flickable. This makes TextArea behave like a standalone scrollable editor. Change-Id: I8181e8ebe0edbcdfef2c30c9e102db7cbe4ff705 Task-number: QTBUG-51677 Task-number: QTBUG-52169 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* import Qt.labs.controls 1.0 => QtQuick.Controls 2.0J-P Nurmi2016-04-211-1/+1
| | | | | | | | | Docs, resources, .metainfo and plugins.qmltypes will be updated in follow up commits. Change-Id: I4438c5bfb8802bff0fa15c56431cfd288f179861 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* import Qt.labs.templates 1.0 => QtQuick.Templates 2.0J-P Nurmi2016-04-211-1/+1
| | | | | | | | | | | | | | Even though there never was such thing is QtQuick.Templates 1.0, we'll use version 2.0 to keep it in sync with QtQuick.Controls 2.0 (next step). The templates define (and in the future, revision) the API of the controls, so the two must have the same version or it will get messy. Docs and plugins.qmltypes will be updated in follow up commits. Change-Id: Idc2e76f32f348ba35eb4b1fa167c6868300aa910 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7J-P Nurmi2016-04-201-4/+5
|\ | | | | | | Change-Id: Ia8879787703c32db44119b25be10adc83adc40bb
| * Material: correct paddings for text edit controlsNikita Krupenko2016-04-131-4/+5
| | | | | | | | | | Change-Id: Ie3e1808057af370f3f6a923a8a56709dd80223b8 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Controls: update license headersJ-P Nurmi2016-04-141-2/+2
| | | | | | | | | | | | | | This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. Change-Id: Ib653135662bfd353a73290539995e8e5be211587 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Correct placeholderText.visible with preeditTextLiang Qi2016-01-191-1/+1
|/ | | | | | | | Both for TextArea and TextField. Task-number: QTBUG-50412 Change-Id: I273c8520482ef288ee28c7cbb54e5d96623f7900 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Update Material editorsJ-P Nurmi2015-11-261-6/+20
| | | | | | | | | | | | | - hide the cursor and stop the timer when the editor doesn't have active focus - bring the cursor visible when gaining focus, and keep it visible while it's being moved - make use of QStyleHints::cursorFlashTime() - fix background positioning - set selection color to avoid the default blue Change-Id: I588f1f1cceaa2a6c9930cbdb1f0d1680117e0eef Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add Material styleMitch Curtis2015-11-121-0/+93
Change-Id: I93662a53b42858a5b65154c5ede334182e738dde Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 16:42:50 +0000