aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/TextField.qml
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2017-01-111-1/+1
|\ | | | | | | Change-Id: If797ac58344b20e8de4379343131c097247ba2f2
| * Welcome to 2017J-P Nurmi2017-01-091-1/+1
| | | | | | | | | | Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Editors: fix placeholder text alignmentJ-P Nurmi2017-01-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The internal QQuickPlaceholderText creates an "implicit binding" to the editor's horizontalAlignment, meaning that the placeholder respects the editor's horizontal alignment when explicitly set, and otherwise determines the alignment from the placeholder text's visual direction. [ChangeLog][Controls][TextField] Fixed the horizontal alignment of the placeholder text in right-to-left UIs. [ChangeLog][Controls][TextArea] Fixed the horizontal alignment of the placeholder text in right-to-left UIs. Task-number: QTBUG-55999 Change-Id: If1a8596c35c1920874996277520f1c54430c5f69 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Bump the QtQuick import versions in the stylesJ-P Nurmi2016-12-191-1/+1
| | | | | | | | | | | | | | Qt 5.9 == QtQuick 2.9 Change-Id: I7d4f749645011c4e78bdafe80824b83bd166e7c7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update import versions in src/import/controls - part IIJ-P Nurmi2016-11-231-1/+1
| | | | | | | | | | | | | | The templates imports were missed in fb7c9541, sorry. Change-Id: I9742f1a86b01083ae1b7c6ae48b43098be8385c5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update import versions in src/import/controlsJ-P Nurmi2016-11-231-2/+2
|/ | | | | Change-Id: Ic6cd0450a13b965578a0ab8f590270f4e52ffca6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-11-021-2/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/Drawer.qml src/imports/controls/Frame.qml src/imports/controls/GroupBox.qml src/imports/controls/Page.qml src/imports/controls/Pane.qml src/imports/controls/ToolBar.qml src/imports/controls/Tumbler.qml src/quicktemplates2/qquickapplicationwindow.cpp src/quicktemplates2/qquickpopup.cpp tests/auto/accessibility/data/busyindicator.qml tests/auto/accessibility/data/button.qml tests/auto/accessibility/data/checkbox.qml tests/auto/accessibility/data/control.qml tests/auto/accessibility/data/dial.qml tests/auto/accessibility/data/label.qml tests/auto/accessibility/data/menu.qml tests/auto/accessibility/data/pageindicator.qml tests/auto/accessibility/data/popup.qml tests/auto/accessibility/data/progressbar.qml tests/auto/accessibility/data/radiobutton.qml tests/auto/accessibility/data/rangeslider.qml tests/auto/accessibility/data/scrollbar.qml tests/auto/accessibility/data/scrollindicator.qml tests/auto/accessibility/data/slider.qml tests/auto/accessibility/data/spinbox.qml tests/auto/accessibility/data/switch.qml tests/auto/accessibility/data/tabbar.qml tests/auto/accessibility/data/tabbutton.qml tests/auto/accessibility/data/textarea.qml tests/auto/accessibility/data/textfield.qml tests/auto/accessibility/data/toolbar.qml tests/auto/accessibility/data/toolbutton.qml tests/auto/accessibility/tst_accessibility.cpp Change-Id: Ibc3f592162e97bef9147b35da8c9a79e73a907e6
| * Get rid of the remaining qdoc markers in the Default styleJ-P Nurmi2016-11-011-2/+0
| | | | | | | | | | Change-Id: Id90911cbac46d2d68284abca08dc7165ace71113 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update all QtQuick imports in src/imports/controlsJ-P Nurmi2016-10-041-1/+1
| | | | | | | | | | | | | | | | | | Most were importing 2.6, some 2.4, and some 2.7. Use consistently the latest available Qt Quick version 2.8. This can be easily tracked to the corresponding Qt version. Change-Id: Ic231b3cc0cb5d2d5cf806fe11c4ff3fd557d09e0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Default: consolidate style colors into a singletonMitch Curtis2016-09-121-5/+7
| | | | | | | | | | | | | | | | This reduces all of the duplicate literals that we currently have. Task-number: QTBUG-55867 Change-Id: I28f1f646d25f2f6578d52b4ba96f8f0f3ad6706b Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-09-061-2/+4
|\| | | | | | | Change-Id: Ief98cd56abd13cfa4e30578e150207462a8243b8
| * TextField: improve the implicit size calculationJ-P Nurmi2016-09-051-2/+4
| | | | | | | | | | | | | | | | | | | | In general, we don't want TextField to grow while typing, but if there is no background nor placeholder, use content width as a fallback. Also take content height into account while calculating the implicit height. Task-number: QTBUG-55684 Change-Id: Iee0eff6861c3573045036a06d7e53f7fc313fbe8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add hover support to TextArea & TextFieldJ-P Nurmi2016-06-291-1/+1
|/ | | | | | Task-number: QTBUG-50003 Change-Id: Ie101ba8840fba2a7503da8de77d9cf2a3c91d562 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Default: fill TextField backgroundJ-P Nurmi2016-06-151-1/+1
| | | | | | | Sync with SpinBox, which fills the background with white. Change-Id: Ic3aae664615d45873542ebaf56a848a10263611b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Controls: update all paddings to relative value with paddingLiang Qi2016-05-191-1/+1
| | | | | Change-Id: I7bf3a7fb9ca97e5c7ddf34f8f921d5d4be733861 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Default: add missing TextField focus visualsJ-P Nurmi2016-05-121-2/+2
| | | | | | Task-number: QTBUG-50993 Change-Id: Id39aea05d76cc89519a1719e8109cb4a25704b88 Reviewed-by: Mitch Curtis <mitch.curtis@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>
* 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>
* Correct TextArea/TextField visualsMitch Curtis2016-01-061-1/+1
| | | | | Change-Id: I812f36c5ff7ca0e5cf3c7e8f866a756584a1a220 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Implement more of default style designMitch Curtis2015-11-261-4/+7
| | | | | Change-Id: Ieaa2fa1b876d75f94f48a7fce0c47c166b969d57 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Adjust default style to match current specs.Mitch Curtis2015-11-191-9/+8
| | | | | | | There are still more changes to come. Change-Id: I94ed2c5d649d72d90e43120841c2457091200b59 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Editors: hide placeholder text when h-centered & focusedJ-P Nurmi2015-11-021-1/+1
| | | | | | | | | | | | | | The same was done to QLineEdit in qtbase commit a2666d3. A quote from the commit message: A blinking cursor in the middle over horizontally centered placeholder text looks bad. Thus, horizontally centered content is now considered as an exception and the placeholder text is hidden when the line edit is focused. Change-Id: I5f86482c425fe878ecf6b4046dd835a0464d2150 Task-number: QTBUG-49147 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Simplify TextField & TextArea placeholderJ-P Nurmi2015-10-301-5/+5
| | | | | | | | | | Better not expose the extra Text item in the API. Ideally it should be implemented as a scenegraph node. We might even want to promote the placeholderText property (and add placeholderColor) to TextInput and TextEdit in Qt Quick core. Change-Id: I4f443c77d1c696b87a50ee184f868713dd50316f Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* TextArea & TextField: fix placeholder alignmentJ-P Nurmi2015-10-201-0/+2
| | | | | | | | Placeholder text should follow the alignment of the control itself, so that text input appears in the same place where a placeholder was. Change-Id: I1dfa6c2aece10eb92e62a14f347c7e1ec5e610ea Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* TextField: fix implicit sizeJ-P Nurmi2015-10-041-0/+5
| | | | | Change-Id: Iceaa5af83b2a9f0eb03829829fcfc4e4a6261100 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename QtQuick.Controls 2.0 to Qt.labs.controls 1.0J-P Nurmi2015-10-011-2/+2
| | | | | Change-Id: I142622dd85e95ef70b11132e77ccf48701f2cabc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename QtQuick.Templates 2.0 to Qt.labs.templates 1.0J-P Nurmi2015-10-011-1/+1
| | | | | | Change-Id: I3263a600065dfa2bfe7334ec44a74e2dca83aa36 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix Tumbler font, and TextField & TextArea placeholder fontsJ-P Nurmi2015-09-251-0/+1
| | | | | Change-Id: Ifbc8e0a221b1190becb789d69b9b313ab45e1615 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Controls: move Accessible from QML to C++Liang Qi2015-09-141-6/+0
| | | | | | | | | | | Controls 2.0 could be built with QT_NO_ACCESSIBILITY defined. Added a few helper functions for accessible in QQuickControl. Don't set text as Accessible.name for TextArea and TextField. Change-Id: I40383bbcec2f8c742f709bdec0209623f80da449 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Use QtQuick.TemplatesJ-P Nurmi2015-09-091-1/+2
| | | | | Change-Id: I3d1822457efd740e7c9d91747e978d787c0dd4b8 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* TextField: Fix sizing issues on the placeholder text elementGabriel de Dietrich2015-07-201-2/+3
| | | | | | | | | | The properties availableWidth and availableHeight are not part of QQuickTextField (it doesn't inherit QQuickControl). Also, the placeholder text may need to be elided if it doesn't fit. Change-Id: Ibcae6d9622ba88781de2e6c92447216dc6bdd9e7 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Remove non-color properties from ThemeJ-P Nurmi2015-07-061-2/+2
| | | | | | | | Better start with a minimal set. It will be also easier to transition from Theme to Palette if it gets done. Change-Id: Ic9951ac5b913f99a84e2b8efb9ae7f8d61177aee Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Remove Theme.disabledOpacityJ-P Nurmi2015-06-301-2/+1
| | | | | | | Use Theme.disabledColor instead. Change-Id: I76311d6c6b573b01a26ee2b8d434a841c4d86292 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Revert "Rename Control::availableWidth/Height to contentWidth/Height"J-P Nurmi2015-06-181-2/+2
| | | | | | | | | | | TextField and TextArea have different semantics for contentWidth and contentHeight. In addition, it looks like we need to restore contentWidth and contentHeight for Frame & GroupBox. This reverts commit 6941b934bdf5f3c7b65f682c8dfc5c6562292351. Change-Id: Ia115025a67b472ac67fbbc915b80312e4b4a7431 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Docs: TextFieldJ-P Nurmi2015-06-161-0/+4
| | | | | Change-Id: I892ca73cdc1d96d924b369b30d822b3dd7611c94 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* TextField & TextArea: fix placeholderJ-P Nurmi2015-06-161-2/+2
| | | | | Change-Id: Ie59899d0f88a940a434b5ac9148ac453066169fd Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename Control::availableWidth/Height to contentWidth/HeightJ-P Nurmi2015-06-151-2/+2
| | | | | Change-Id: Ia39a52e7e8d968b05fd7a2d64ab3b3030a9f528e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Use Control::availableWidth and availableHeightJ-P Nurmi2015-06-091-2/+2
| | | | | | | | | The same "w - lp - rp" and "h - tp - bp" patterns were repeated all over the codebase. This is why availableWidth and availableHeight were introduced. Change-Id: I8124e8668b553a409a25aa18d775f1bf0494398d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Use Theme.disabledColor to get sensible looks in disabled stateJ-P Nurmi2015-04-231-2/+1
| | | | | Change-Id: I28831c979f8fa040fc3388eec6f2256930a3d91d Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename Style to ThemeJ-P Nurmi2015-04-081-9/+9
| | | | | Change-Id: I0186cd36f0b42ca015b70a09af27f8a3517d4a60 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Implement Style as an attached propertyJ-P Nurmi2015-03-111-9/+9
| | | | | Change-Id: I006ee566647e31d1a14919d164d7dd68539aae10 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* QQuickAbstractTextField: inherit QQuickTextInputJ-P Nurmi2015-03-061-24/+8
| | | | | Change-Id: Ibd98bd712fa247b2c20c1099fa031ab8184b7f20 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Add Control::padding for convenienceJ-P Nurmi2015-03-061-4/+1
| | | | | Change-Id: I9a472e2378854ba07ce34ad571f54b0fa4a3755c Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Update src/imports to use top/left/right/bottomPaddingJ-P Nurmi2015-03-031-11/+14
| | | | | Change-Id: I9c72db2d8f44429a7c87baaad663b88c7e1f1bb9 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
* Import the Qt Quick Controls 2 prototypeJ-P Nurmi2015-02-051-0/+90
Change-Id: Ib8c0c4160958e5cfea29a6e9df1b3f1fb19715fc Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 03:49:07 +0000