aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls
Commit message (Collapse)AuthorAgeFilesLines
* Remove bindings to parent in delegatesMitch Curtis2020-07-305-5/+5
| | | | | | | | | | | | | | | | Until we've decided whether to a) document that properties of parent should not be bound to in delegates or b) fix the warning that results from doing so after 8c72e634b3b0eacbfdee883bfc34994d3c19ed77, we can pre-emptively clean up a few places where it happens. Task-number: QTBUG-81976 Task-number: QTBUG-82393 Task-number: QTBUG-82989 Change-Id: I1e610613f6016ec1b9cf9ca33cdfb15d384731a8 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 456d26e97ec7745fdbd1afaaaa6c1dc217eca060) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: mention cache property in the relevant placesMitch Curtis2020-07-152-0/+3
| | | | | | | | | This was missed in 033564edf5b79e32da63597930e25105a3442f01. Change-Id: I7bc465338d5b9960ad7b746a816cd33efcca1bdc Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit feabd686a31d257638d9cdc80c6dd36e8709e279) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove another binding to parentMitch Curtis2020-07-151-1/+1
| | | | | | | | | | | | | | | Similar to what was done in 456d26e97ec7745fdbd1afaaaa6c1dc217eca060. The warning was: Material/ComboBox.qml:68: TypeError: Cannot read property 'Material' of null Task-number: QTBUG-82989 Change-Id: Id82d62d6aca0c0e517d6f8630c51f54739aea95f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit f6f42ddc724b9d01cac20632b3fda43a788d53ec) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QmlDesigner: Fix DialSpecifics snap modeHenning Gruendl2020-06-171-1/+1
| | | | | | | | Task-number: QDS-2278 Change-Id: I74be7066b1bf2a0827a3fe7dca7b46e466ef8c58 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit b9bf86f06fafec9c2aace64b05d1a5dfae24ea7e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add missing paletteChanged() to setForeground() in Material styleJoni Poikelin2020-06-081-0/+1
| | | | | | | Change-Id: I7396885688c6091a948f2865ff716e84f7f5195b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit d3fd504b31a531f1bfcd9c3d34991357a36334ce) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QmlDesigner: Update properties in property editorHenning Gruendl2020-04-2712-8/+247
| | | | | | | | | Add missing and cleanup existing properties in property editor. Task-number: QDS-1502 Change-Id: I33259e244d5a4471e01f7fc1845ad05414367eae Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Update plugins.qmltypes for 5.15Jani Heikkinen2020-04-155-5/+34
| | | | | | Task-number: QTBUG-82253 Change-Id: I93ae7b51b902050020cf7a79510b8325060181c5 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Material: revision sliderDisabledColorv5.15.0-beta4v5.15.0-beta3Mitch Curtis2020-03-311-1/+1
| | | | | | | | | This amends 0d5a43fa8. Cherry-picked from branch: dev Change-Id: I68c500ae874c92467b414dbf37eec9d55b3c730f Reviewed-by: cherrypickbot
* HeaderView: Add support for list based modelsAndy Shaw2020-03-2410-10/+30
| | | | | Change-Id: I411136bd2b9a277d84a7c68c55bb1c317b6cc9d2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-03-212-4/+4
|\ | | | | | | Change-Id: I9ecddc7a68da4f15ee2c2904e237496eb6a2aa26
| * Doc: Make sure import is highlightedKai Koehne2020-03-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use \qml ... \endqml to allow qdoc highlighting the import as QML. Also parameterize the example import QtQuick.Templates import so that it always uses the last import version. Change-Id: I3fecc8b301c58a89769caf5aa3a764551ff683b3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: Fix highlighting of importKai Koehne2020-03-091-2/+2
| | | | | | | | | | Change-Id: Ic1f1583d6956180470ddd9d4869ea437c05be343 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Account for the padding around a menu when checking if it is interactiveAndy Shaw2020-03-185-5/+15
| | | | | | | | | | | | | | | | | | | | If there is padding around the menu then it will mean the available height is smaller than the containing item and as such should be interactive. Fixes: QTBUG-82473 Change-Id: Ie3e7568ab66aa3da93e5448c1a27c9bd2a5e486a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: Make Slider's track accent colored and semi-transparentPaweł Gronowski2020-03-171-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | According to the Material Design guidelines Slider's track should be accent colored and semi-transparent. Additionally it should be a bit thicker. The original ticket in the bug tracker mentions it to be 2px 2px but I think that the 4px makes it look a lot more like the one presented in the guidelines (https://material.io/components/sliders/). Task-number: QTBUG-70768 Fixes: QTBUG-70768 Change-Id: I062c0938297ae877b37605b6d536e11b464d477f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: Make RangeSlider's track accent colored and semi-transparentPaweł Gronowski2020-03-171-8/+9
| | | | | | | | | | | | | | To match the Slider's appearance. Change-Id: Ida7a03877c7b8a23508c532dbb275f96bc137742 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: Change RangeSlider's color to grey when not enabledPaweł Gronowski2020-03-171-1/+1
| | | | | | | | | | Change-Id: I0cc390e1a46242ef22bb7d5460701e7b14087ee7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Material: Change slider's color to grey when not enabledPaweł Gronowski2020-03-174-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | When Slider was not enabled it would look exactly the same as when enabled. [ChangeLog][Controls][Material] Add visual distinction between an enabled and not enabled slider. Task-number: QTBUG-70768 Change-Id: If0d7e5adc19d8bc22a810cb2ba4e57b657ab48d4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | HeaderView: set implicitSize on the style itemsv5.15.0-beta2Richard Moe Gustavsen2020-03-1011-24/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By setting an implicit size, the user don't need to set a width or height on a HeaderView himself, but it will get the default size recommended by the style. By doing it the way it's done in the patch we achieve the following: 1. A HeaderView will by default be resized to be the same size as the delegate. 2. If the application sets a size on HeaderView it that is larger than the implicit size of the delegate, the delegate will be resized to have the same size (effectively filling out the free space in the header). 3. If the size of HeaderView is smaller than the implicit size of the delegate, the delegate will simply be clipped. (effectivly saying that the implicitSize of the delegate is also it's minimum size). If this is not acceptable for the application, it will need to use a custom delegate. Since a HeaderView delegate is a component and not an item, it should not be a part of the sanity checks we do to avoid using internal IDs. Hence we blacklist until we have a better way of handling such cases. Task-number: QTPM-1300 Change-Id: I30ca3e13ce5e1371b60f5c4ecf742a7d7e794a36 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Imagine: fix Dial being squishedMitch Curtis2020-03-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | - Since we probably don't want to wrap the background in an Item, use "fillMode: Image.PreserveAspectFit" on it to ensure that the background isn't squished. - Use the same binding for the Translate's y property as we do in all of the other styles. Fixes: QTBUG-82463 Change-Id: I43129959e03ad489a8c231a7a42c192264b380ac Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1Qt Forward Merge Bot2020-02-223-3/+3
|\| | | | | | | Change-Id: Iff02839c8ace49582750e06fa1ea9c559f6c93fe
| * clang-tidy: fix bugprone-integer-divisionMitch Curtis2020-02-193-3/+3
| | | | | | | | | | | | | | | | | | | | | | An example of one of the warnings: qquickfusiondial.cpp:87:15: warning: result of integer division used in a floating point context; possible loss of precision [bugprone-integer-division] Change-Id: I9d225e8149935a8f8dde6e8b0657c1406676b7f1 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2020-02-153-7/+7
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf tests/auto/qquickpopup/tst_qquickpopup.cpp Change-Id: Id3bca2da290234f3c69845ffe18c6d9193a1bd28
| * Copy Qt Quick Designer-related files also for static buildsKai Koehne2020-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that the 'designer' directory is copied to the build directory, or installed, also for static builds. This reverts the !static condition introduced to fix a build breakage in 01d076d0e81e5 . Anyhow, I couldn't reproduce the original problem (QTBUG-51708), nor is it clear why it was caused by the static build. Fixes: QTBUG-75682 Change-Id: I47af3907e464d4fd9e9965ac28545b7350f450ee Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * Doc: fix RangeSlider errorsMitch Curtis2020-01-281-4/+4
| | | | | | | | | | | | | | | | | | When the RangeSlider was copied into another file as a child item, it would produce errors about first and second being undefined. Change-Id: I0ecc9f6830509183a1b2b35e3faed5f06e78a0ef Fixes: QTBUG-80970 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * set placeholderText by default, not textTim Jenssen2020-01-281-2/+2
| | | | | | | | | | | | | | Task-number: QDS-456 Change-Id: I05b7ce9efab851b99d12ba272a79bf9ba4443398 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add documentation for HorizontalHeaderView and VerticalHeaderViewYulong Bai2020-02-121-0/+123
| | | | | | | | | | | | | | | | | | The example snippet only shows how to lay things out; since TableModel doesn't support declaring header data from QML yet, we also can't show it. Change-Id: Iaf1c4fd39a23be7271d382d743dc30ac459e37cb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Make Fusion style header views look more fusionyMitch Curtis2020-02-122-4/+24
| | | | | | | | | | Change-Id: I659f177ed721b16db7342f37d47d9c062ba2ef97 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | Add HorizontalHeaderView and VerticalHeaderViewv5.15.0-alpha1Yulong Bai2020-02-1116-5/+615
| | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls] Add HorizontalHeaderView and VerticalHeaderView. They are controls associated with TableView. Support flicking synchronization Support default, fusion, imagine, material and universal delegate styles. Fixes: QTPM-1300 Change-Id: Ie3f913dd616cda0d4e5a22a3d95baf71692370fe Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | Upgrade qsb files to version 4Laszlo Agocs2020-01-212-0/+40
| | | | | | | | | | | | | | Also add a compile.bat following the qtdeclarative pattern. Change-Id: Id2350ce6650ca22c1c6403a565c33137ff5a3c64 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2019-12-301-1/+1
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf tests/auto/controls/data/tst_combobox.qml Change-Id: I8471cdac4397f77a8e58140d58c6b50d3c437928
| * clang-tidy: fix readability-const-return-typeMitch Curtis2019-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | The warning was: qquickimaginestyle.cpp:46:1: warning: return type 'const QString' is 'const'-qualified at the top level, which may reduce code readability without improving const correctness [readability-const-return-type] Change-Id: Idcabe034f0e38a1b15b406d7bddc4662b6ea2261 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | ComboBox: add selectTextByMouse propertyMitch Curtis2019-12-125-31/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows configuring the selectByMouse property of the underlying TextField for editable combo boxes. Named selectTextByMouse instead of selectByMouse to avoid confusion with selection of the items themselves. [ChangeLog][Controls][ComboBox] Added selectTextByMouse property. Change-Id: I852e4cd44ebe6b2a1ed2535513ea2fc35cbe0a32 Fixes: QTBUG-71406 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-304-10/+13
|\| | | | | | | Change-Id: Icb923b10d2b6c524ebaa8b38c7979b780e3582d4
| * Doc: Fix qdoc warningsVenugopal Shivashankar2019-11-264-10/+13
| | | | | | | | | | | | | | | | | | | | | | The warnings were about: - Undocumented function parameters - Instances of \instantiates that us an internal class - A few link issues Task-number: QTBUG-79827 Change-Id: I60094279c7da6bc446b5c63b7b4924b71cee4672 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Don't delete items we didn't createMitch Curtis2019-11-282-23/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up until this patch, we've always deleted "old" items when a new one is assigned. For example, the style's implementation of contentItem will be destroyed here as it is not accessible by the user and is no longer used: Button { contentItem: Item { /* ... */ } } This was especially important before the introduction of deferred execution, as the "default" items would always be created, regardless of whether the user had overridden it with one of their own items. By deleting the old items, we free unused resources that would otherwise persist until application shutdown (calling gc() does not result in the items being garbage-collected, from my testing). Although this has largely worked without issues, deleting objects that weren't created by us in C++ is not supported. User-assigned items can be created in QML (with JavaScriptOwnership) or C++ (with CppOwnership), and it is up to the user and/or the QML engine to manage the lifetime of these items. After the introduction of deferred execution, it became possible to skip creation of the default items altogether, meaning that there was nothing to delete when assigning a new, user-specified item. This requires that no ids are used in these items, as doing so prevents deferred execution. Assuming that users avoid using ids in their items, there should be no unused items that live unnecessarily until application shutdown. The remaining cases where items do not get destroyed when they should result from the following: - Imperative assignments (e.g. assigning an item to a Button's contentItem in Component.onCompleted). We already encourage declarative bindings rather than imperative assignments. - Using ids in items. Given that these are use cases that we will advise against in the documentation, it's an acceptable compromise. [ChangeLog][Important Behavior Changes] Old delegate items (background, contentItem, etc.) are no longer destroyed, as they are technically owned by user code. Instead, they are hidden, unparented from the control (QQuickItem parent, not QObject), and Accessible.ignored is set to true. This prevents them from being unintentionally visible and interfering with the accessibility tree when a new delegate item is set. Change-Id: I56c39a73dfee989dbe8f8b8bb33aaa187750fdb7 Task-number: QTBUG-72085 Fixes: QTBUG-70144 Fixes: QTBUG-75605 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-168-5/+8
|\| | | | | | | Change-Id: I932a1b1606975265e6affd50e161e58737404a0d
| * Make ToolTips wrapMitch Curtis2019-11-155-5/+5
| | | | | | | | | | | | | | | | Otherwise the text will go outside the window. Change-Id: I3d50a195b1ee6c9b5d49952ef6c49d17c61372fa Fixes: QTBUG-62350 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| * SwipeView: fix issue where child items couldn't get focusMitch Curtis2019-11-153-0/+3
| | | | | | | | | | | | | | | | | | Set the focus property of the contentItem (ListView) to the focus property of the SwipeView itself. Change-Id: Ic410f7fb8db9fbb758b956dfe07e1b4265f5f687 Fixes: QTBUG-62401 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091480-0/+7
|\| | | | | | | Change-Id: Ib14b8c77cefe7aaf5b11483d9a30b2ef05314598
| * Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-11-081-0/+7
| |\ | | | | | | | | | Change-Id: I551670d92af2bc96d5d8b8724bf5b280e94498c7
| | * Doc: advise against naming root resource dirs the same as style namesMitch Curtis2019-11-071-0/+7
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-59330 Change-Id: Ie983f27f2eca0bc9c906fb7bcfe9e077616ef88b Reviewed-by: Kavindra Palaraja <kpalaraja@luxoft.com> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051479-0/+0
| |\| | | | | | | | | | Change-Id: I4b970036bdb5d312b0dc5cb1bcbd8e161e3d4c7e
| | * Run optipng on all imagesMitch Curtis2019-11-041479-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | find . -name "*.png" -exec optipng -o 7 -strip all {} \; Change-Id: I2238b2dd38813d33ed48d79817f872f922cfa28d Fixes: QTBUG-79275 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-021-1/+1
|\| | | | | | | | | | | Change-Id: Ida6e83517802b1e970f755b2e2128b77f08a8d11
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-261-1/+1
| |\| | | | | | | | | | Change-Id: I5da24592eb292ef4f430d734fec234166ce6e1e3
| | * Docs: Update qmlmodule to use QtMinorVersion so that this version is always ↵Kavindra Palaraja2019-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | up to date Fixes: QTBUG-76077 Change-Id: Ica06051a8ca5dc3858110f5eef47fec20bd2d2c1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-265-5/+1075
|\| | | | | | | | | | | Change-Id: If43d5edea9ec0d4beaa3336b3e9aeefc698c5e6b
| * | Update plugins.qmltypes for 5.14Kai Koehne2019-10-215-5/+1075
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: I0e421232f4335a7a351562f23134eccdd0b1c674 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Simon Hausmann2019-10-182-14/+28
|\| | | | | | | | | | | Change-Id: I0b6bd9acd2262ae87e1086a0450875a8f04a0423
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-122-14/+28
| |\| | | | | | | | | | Change-Id: I0b00323007dc02adf98dc581e2694e44b298da29