aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickcombobox.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-10-191-7/+49
|\ | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate.qml src/imports/controls/material/qquickmaterialstyle.cpp Change-Id: I00b533e28407f87a31588e92109a468a5bfb4cc8
| * ComboBox: fix documentation review findingsMitch Curtis2016-10-141-7/+49
| | | | | | | | | | | | Change-Id: Iba9bdd74ab5b9865a2314ccc460fa44b9ea35be5 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-10-031-4/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/quickcontrols2/gallery/gallery.qrc src/imports/calendar/doc/snippets/qtlabscalendar-calendarmodel.qml src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml src/imports/calendar/doc/snippets/qtlabscalendar-dayofweekrow.qml src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid-layout.qml src/imports/calendar/doc/snippets/qtlabscalendar-monthgrid.qml src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml src/imports/calendar/doc/snippets/qtlabscalendar-weeknumbercolumn.qml src/imports/controls/doc/qtquickcontrols2.qdocconf src/imports/controls/doc/snippets/qtlabscalendar-calendarmodel.qml src/imports/controls/doc/snippets/qtlabscalendar-dayofweekrow-layout.qml src/imports/controls/doc/snippets/qtlabscalendar-dayofweekrow.qml src/imports/controls/doc/snippets/qtlabscalendar-monthgrid-layout.qml src/imports/controls/doc/snippets/qtlabscalendar-monthgrid.qml src/imports/controls/doc/snippets/qtlabscalendar-weeknumbercolumn-layout.qml src/imports/controls/doc/snippets/qtlabscalendar-weeknumbercolumn.qml src/imports/controls/doc/snippets/screenshots/qtlabscalendar-calendarmodel.qml src/imports/controls/doc/snippets/screenshots/qtlabscalendar-dayofweekrow-layout.qml src/imports/controls/doc/snippets/screenshots/qtlabscalendar-dayofweekrow.qml src/imports/controls/doc/snippets/screenshots/qtlabscalendar-monthgrid-layout.qml src/imports/controls/doc/snippets/screenshots/qtlabscalendar-monthgrid.qml src/imports/controls/doc/snippets/screenshots/qtlabscalendar-weeknumbercolumn-layout.qml src/imports/controls/doc/snippets/screenshots/qtlabscalendar-weeknumbercolumn.qml src/imports/controls/qtquickcontrols2plugin.cpp src/quicktemplates2/qquicktooltip.cpp src/quicktemplates2/qquicktooltip_p.h src/quicktemplates2/qquicktumbler.cpp tests/auto/controls/data/tst_spinbox.qml tests/auto/controls/data/tst_tumbler.qml tests/auto/qquickmaterialstyle/data/tst_material.qml Change-Id: I25b7473b47739043b6f768603bece30b18021318
| * Fix ComboBox to scroll to the highlighted itemJ-P Nurmi2016-10-021-4/+11
| | | | | | | | | | | | Change-Id: I57fefd8ba47796118e71902c6882e9918d462920 Tasl-number: QTBUG-55030 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Revert "Popup: expose flip API"J-P Nurmi2016-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 09706e8f9fc481d848a3616cace58baf5bc8b67c. It was a bit rushed to expose the allow*Flip properties. We have now added several other similar internal allowFooBar flags, so clearly a more sustainable solution is to craft some kind of horizontal and vertical sizing/positioning policies out of them. So, remove this unreleased API while we still can, so we don't have to deprecate it right away. Conflicts: src/imports/templates/qtquicktemplates2plugin.cpp Change-Id: Iea33c11805071499b472b18426bbdc8d871a4a58 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-09-141-2/+2
|\| | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquicktextarea_p_p.h src/quicktemplates2/qquicktextfield_p_p.h Change-Id: Ie7b4a114ad27a4cad337c91e8ebcf696b0e845d7
| * Delete replaced delegates after Component.completed() is emittedMitch Curtis2016-09-121-2/+2
| | | | | | | | | | | | | | | | | | This avoids the issue "Object destroyed during incubation" error. A proper fix is still required in the QML engine. Change-Id: I3c168cfe2d8c295662bcb5886e99a0f95748e302 Task-number: QTBUG-50992 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add ComboBox::flatJ-P Nurmi2016-08-111-1/+32
| | | | | | | | | | | | | | | | | | [ChangeLog][ComboBox] Added a flat property that provides more suitable looks for using ComboBox in a ToolBar. Task-number: QTBUG-54935 Change-Id: Id458a078486aeac5d542a57f3ed247d63d25e95c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devJ-P Nurmi2016-08-091-0/+6
|\| | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickpage.cpp Change-Id: I4c8b62fb1d7c20c6d3c870eb47e0402a20051098
| * ComboBox: ensure an update of the current text on data changeJ-P Nurmi2016-08-091-0/+6
| | | | | | | | | | | | Task-number: QTBUG-55118 Change-Id: I4edcd660a35d8b8719fc4c09719332d088859ffc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Popup: expose flip APIJ-P Nurmi2016-07-091-1/+1
|/ | | | | | | | | [ChangeLog][Popup] Added allowVerticalFlip and allowHorizontalFlip properties to control whether flipping is allowed to fit a popup inside the window. Change-Id: Id14a8846a1e2d07e98207da7c2b2765c202dbaf9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix QQuickComboBox::textAt()J-P Nurmi2016-07-061-2/+9
| | | | | | | | | | | | QQmlObjectModel::object() increases the reference count, and must be paired with QQmlObjectModel::release() to decrease the reference count when the object reference is no longer needed. When ComboBox model changed, previously created delegate instances weren't released as appropriate, because their reference counts were non-zero. Change-Id: I55d67b8baf3c00c1236155b1196a958b6db79e28 Task-number: QTBUG-54573 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: add missing \since 5.7 tagsJ-P Nurmi2016-05-251-0/+1
| | | | | Change-Id: Ie4680c5dfadc95278215b688f4fc28577f557933 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* ComboBox: increase/decrease() => increment/decrementCurrentIndex()J-P Nurmi2016-05-201-16/+16
| | | | | | | | | ComboBox does not have a value-property, unlike Slider, SpinBox, Dial, and ScrollBar. Change-Id: I9832ef8df1532d4cb85b981b164c7c85e8a82135 Task-number: QTBUG-53519 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Popup: don't ignore Back keyNikita Krupenko2016-05-181-0/+2
| | | | | | | | | This allows to close popup on mobile device when Back key pressed and CloseOnEscape policy is set. Change-Id: I97e863b462ee50d2d8e79d18cf8097f960f14227 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* ComboBox: separate indicatorJ-P Nurmi2016-04-281-1/+28
| | | | | | | | This makes it possible to hide or replace either ComboBox background or content item without losing the built-in indicator. Change-Id: I308bbaa8190eba04ff3048a20c2d2ed0431a24f2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Remove "strong" focus policy from menu items created by ComboBoxNikita Krupenko2016-04-261-1/+3
| | | | | | | | | This is needed to fix scrolling in Material ComboBox, as it use MenuItem instead of ItemDelegate (due to a fonts). Task-number: QTBUG-52979 Change-Id: I6cd5ce6ef1773c44f3ff826e6bb261574aa01b78 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Promote QQuickToolTip's repositioning code to QQuickPopupJ-P Nurmi2016-04-251-2/+4
| | | | | | | | | | | | | | QQuickToolTip already had repositioning implemented for both horizontal and vertical directions. Promote that code up to QQuickPopup so that QQuickMenu gets properly repositioned when used as a context menu. As special cases, QQuickComboBox enables vertical flipping for its popup, and QQuickToolTip enables both. In the QQuickPopup base class, both are disabled by default. Task-number: QTBUG-52608 Change-Id: Ia8f835321222d4841a6f79434822b33f057d13fc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: cleanup remaining "labs" referencesJ-P Nurmi2016-04-211-2/+0
| | | | | Change-Id: I5b0015476c3ceef8f82b00d99b084b1ce3bfaa6f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Doc: rename Qt.labs.controls 1.0 to QtQuick.Controls 2.0J-P Nurmi2016-04-211-18/+18
| | | | | | Change-Id: Id6c476424fa359d222f027584278346fc0984069 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Popup: rename close policy flagsJ-P Nurmi2016-04-201-1/+1
| | | | | | | | | | | Even though it gets a bit long, it's much easier to remember close policy values that start with "Close". Even with auto-completion, one still has to type something for Qt Creator to know what to complete. That's where consistency (closePolicy -> CloseFoo, snapMode -> SnapBar) helps. Change-Id: Idc86322c0d1e367fad87eb1deafbf58ef6ddb04d Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* ComboBox: respect currentIndex:-1J-P Nurmi2016-04-181-2/+4
| | | | | | | | Don't override explicitly set current index in Component.onCompleted. Task-number: QTBUG-52615 Change-Id: If5ce4ec1db29f8ac94d457d297910d61fb0b8a18 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: fix ComboBox::highlightedIndex \readonly tagJ-P Nurmi2016-04-151-1/+1
| | | | | | | The tag slipped to wrong place in eae24fcc. Change-Id: I2d66a78fc1d5a698f6338811ec15e3a26ee32772 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Add QQuickAbstractButton::downMitch Curtis2016-04-151-1/+1
| | | | | | | | | | | | | | | | | This property will determine whether or not the button is visually pressed. Having such a distinction allows users more control over their controls. The patch also fixes the problem with ComboBox where pressing on the ComboBox when it's open would cause a delegate in the popup to show as being pressed. Unless explicitly set, this property follows the value of the pressed property. To return to the default value, set it to undefined. Change-Id: I29ecf325ed2ede125613f0c878b0427937599866 Task-number: QTBUG-51005 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Templates: update license headersJ-P Nurmi2016-04-141-2/+2
| | | | | | | This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. Change-Id: I39ef9cbb00f55a32b7a43f11ffbdfbb40b84e124 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Doc: add 2-suffix to the image assets and snippetsJ-P Nurmi2016-04-131-1/+1
| | | | | Change-Id: Ib8050cb3baefe07d28c7e2dcec64af155d2d7c9b Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Templates: rename the C++ module to qtquicktemplates2J-P Nurmi2016-04-131-0/+872
Change-Id: I146da903b46f5c2caf865e37291c25376b49021a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 05:08:14 +0000