aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Welcome to 2017J-P Nurmi2017-01-09341-341/+341
| | | | | | | | | | | | | | | Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Editors: fix placeholder text alignmentJ-P Nurmi2017-01-107-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Add ScrollBar::snapModeJ-P Nurmi2017-01-103-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][ScrollBar] Added snapMode property incremental or discrete scrolling. Task-number: QTBUG-56569 Change-Id: Id0d463b85063a62b7df6307af8fe8b203155a5de Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | QQuickTabBar: fix implicit size calculationJ-P Nurmi2017-01-103-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, the implicit size of TabBar was calculated based on the content size of the ListView that TabBar uses internally. The problem was that ListView calculates the content size based on the explicit size of the items. There was a circular dependency, because TabBar resized the tabs to the size of the view. To avoid the circular dependency, TabBar now calculates the content size based on the total implicit size of the tabs. As before, explicit size is respected for tabs that have it set. [ChangeLog][Controls][TabBar] Added contentWidth and contentHeight properties that are automatically calculated based on the total size of the tab items, but can be manually overridden if desired. This fixes an issue that TabBar was not able to reliably calculate an implicit size, and could in certain scenarios enter an infinite loop due to a circular dependency between the items' sizes and the tabbar's size. Task-number: QTBUG-57858 Change-Id: Ie303cbc54247e87b0affc6bf32c7bf99acea4571 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2017-01-051-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/quickcontrols2/quickcontrols2.pro Change-Id: If2f5e40487ba6515ba322f92380573727bdd6bc0
| * | Add screenshot snippets to OTHER_FILES to make them visible in CreatorJ-P Nurmi2017-01-021-0/+1
| | | | | | | | | | | | | | | Change-Id: I6befd6e65a1abc38e0de4ed10abf41dad677744b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | qmldir: update the versions of the module dependenciesJ-P Nurmi2017-01-053-3/+3
| | | | | | | | | | | | | | | Change-Id: Ia4675c1937df2bfa797bc8d0e34d4a9c58232588 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Add DelayButtonJ-P Nurmi2017-01-0213-1/+460
| | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][DelayButton] Added DelayButton. Change-Id: I94820dfb41ba9b90f0a29cda01ac476b54cf3de8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2017-01-028-5/+7
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/platform/qquickplatformmenuitem.cpp Change-Id: I4d399aa81a31112edf6030b52ba5d68828f9729d
| * | Material|SpinBox: Fix trivial C&P typoKonstantin Ritt2016-12-281-2/+2
| | | | | | | | | | | | | | | Change-Id: I8bdd973f69ae246220b58a312f5d82d9134f35f6 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Material: Optimize "check" icon imagesKonstantin Ritt2016-12-283-0/+0
| | | | | | | | | | | | | | | | | | | | | Size decrease: 7630 -> 6614 (bytes) Change-Id: I14eefbb60e0246dd260977acb01a79e4fb4c9584 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Material: set default ToolBar's spacing to 16Konstantin Ritt2016-12-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | According to the Material design guidelines, it is an appropriate spacing value for most use cases Change-Id: Ie72c63b3ca2e1a5b7457a38b460cf2bc4acbecb2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Bump style plugin dependencies to QtQuick.Controls 2.1Konstantin Ritt2016-12-283-3/+3
| | | | | | | | | | | | | | | Change-Id: I316ec8deab791c0e8ebf0bbb9bb1a07e8aacad6b Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | SwipeDelegate: rename swipe.rebound to swipe.transitionJ-P Nurmi2016-12-214-3/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "rebound" name originates from Flickable::rebound, but for swipe delegate the transition is not only applied on release, but also when calling swipe.open() or swipe.close(). Therefore the "rebound" name feels a bit off in this context. Furthermore, this patch adds the missing docs and a changelog entry. [ChangeLog][Controls][SwipeDelegate] Added a swipe.transition property that holds the transition that is applied when a swipe is released, or swipe.open() or swipe.close() is called. Change-Id: Ic38ec850c64dd21b8d9deb08609172c6cb0f6d71 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-12-208-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/material/DialogButtonBox.qml src/imports/controls/universal/DialogButtonBox.qml Change-Id: I16cbf9912a3526783c21a6f30996f83fce9e02c3
| * | Merge remote-tracking branch 'origin/5.8.0' into 5.8J-P Nurmi2016-12-202-0/+2
| |\| | | | | | | | | | Change-Id: I8544063279de0ce12438e867e6b7767b00e72f11
| | * DialogButtonBox: add missing importv5.8.0-rc1J-P Nurmi2016-12-202-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | DialogButtonBox uses the Button-type from the QtQuick.Controls namespace, but did not import it. Change-Id: Ibe635461e280a8f8a78a52a2454fd8524a90a7e1 Task-number: QTBUG-57618 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Remove unused doc imagesMitch Curtis2016-12-026-0/+0
| | | | | | | | | | | | | | | | | | | | | These controls have GIFs now. Change-Id: I5bb931666f169840ebdbe369c179c2d8ca612a21 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Bump the QtQuick import versions in the stylesJ-P Nurmi2016-12-19147-147/+147
| | | | | | | | | | | | | | | | | | | | | Qt 5.9 == QtQuick 2.9 Change-Id: I7d4f749645011c4e78bdafe80824b83bd166e7c7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | SwipeDelegate: transition swipe.positionJ-P Nurmi2016-12-143-48/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the value of swipe.position jumped on mouse/touch release, or when open() or close() was called. Transitioning the swipe.position value smoothly to the target value makes it possible to use it as opacity/scale/etc. for the side items. Notice that this is backwards compatible with the old behavior. If no transition is set, the value jumps the same way it did before. In that case, Behavior on x makes the movement smooth. Task-number: QTBUG-57242 Change-Id: Id9c06b5b08fa73f2f575787e16dc6e20e4ccb545 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Material: prevent ripples from getting stuck in disabled stateJ-P Nurmi2016-12-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ripples don't trigger when the ripple item itself is disabled. This is used in SwipeDelegate to prevent ripples when a swipe is open. Now that swipe.position is transitioned, a release event comes before the swipe position reaches 0, so we must ensure that the wave exits even if it's not yet enabled. Change-Id: Ib4d58ff974262331898db2133e06624eb890f9ed Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-12-011-95/+399
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/SpinBox.qml src/imports/controls/material/SpinBox.qml src/imports/controls/universal/SpinBox.qml tests/auto/controls/data/tst_swipedelegate.qml Change-Id: Ie1d1f487890f0a9f80a00df5e813e1d2e8303fe5
| * | SpinBox: fix input method hints to get the appropriate VKBJ-P Nurmi2016-11-293-3/+3
| |/ | | | | | | | | | | | | | | SpinBox operates on integers. Task-number: QTBUG-56837 Change-Id: Ib77cded8c4483fa78816d004692cacb3532deedd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-281-5/+11
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc sync.profile Change-Id: I554c40516030075142f9af1dd5c66fdca2b78b9a
| | * Doc: clarify the feature comparison tableJ-P Nurmi2016-11-231-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | Changing styles at runtime is not possible in QQC2. Add also footnotes that QQC1 may not provide optimal performance on embedded and mobile. Change-Id: Iea691116eacdcf73482ecd52fd1e9c945a788f9a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: refactor the type comparison tableJ-P Nurmi2016-11-251-90/+388
| | | | | | | | | | | | | | | Change-Id: I2267dcd15bcbcbdee8708208dc5f92eb69b745d6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | SpinBox: add inputMethodHints and inputMethodComposingJ-P Nurmi2016-11-293-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for controlling the input method. Editors and editable ComboBox have these also. [ChangeLog][Controls][SpinBox] Added inputMethodHints and inputMethodComposing properties for controlling the input method when using editable spin boxes. Task-number: QTBUG-56837 Change-Id: I1df21341c9a10c1baa1eaa259a5bbab7145e87c8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Add Drawer::interactiveJ-P Nurmi2016-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][Drawer] Added interactive property that specifies whether the drawer reacts to swipes. This can be used to make drawer a non-closable persistent side-bar. Task-number: QTBUG-53169 Change-Id: I00a794b5ce47b86fcb28e0db784ca0488cd13a7d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-11-252-1/+19
|\| | | | | | | | | | | Change-Id: If528b9f4e502c50e0cd76df75404e257232f0d18
| * | Material Drawer: show a separator line when it has no dim nor elevationJ-P Nurmi2016-11-241-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | This makes a non-dimmed and non-elevated Drawer stand out from the content. Other styles have such separator line always visible. Change-Id: I58a75fbcabcca09248ec4c94ec22338967fbfe87 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Material: fix Drawer to respect Material.elevationJ-P Nurmi2016-11-241-1/+3
| | | | | | | | | | | | | | | Change-Id: Iecb9e44fb955ad5dc9a8ddf69b4340108693458f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | qquickmaterialripple_p.h: add missing qcolor.h includeJ-P Nurmi2016-11-231-0/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-57297 Change-Id: I6ef977700639472eb87eeceef5f9f4c008d20950 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Add ComboBox::editableJ-P Nurmi2016-11-244-33/+128
| | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][ComboBox] Added editable property Task-number: QTBUG-53876 Change-Id: I1cb035b3bb4c63f7935f08298814005fad51b5eb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | qtquickcontrols2plugin.cpp: cleanup the template header includesJ-P Nurmi2016-11-231-5/+1
| | | | | | | | | | | | | | | | | | | | | These are no longer needed. Change-Id: If77c09430781b3d71dbf4dfffc2236d120b5ecfc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Doc: update module import versionsJ-P Nurmi2016-11-234-5/+5
| | | | | | | | | | | | | | | Change-Id: Idd25490d453e5a8aa270b45de48ca4f51d92196e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Update import versions in src/import/controls - part IIJ-P Nurmi2016-11-23121-121/+121
| | | | | | | | | | | | | | | | | | | | | The templates imports were missed in fb7c9541, sorry. Change-Id: I9742f1a86b01083ae1b7c6ae48b43098be8385c5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Sort out and clarify QML type registrationJ-P Nurmi2016-11-231-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot call qmlRegisterRevision() for our own types, because that will register an unnamed type. In practice, the empty type name occurs as a missing type name in qmlInfo() warnings. I've clarified the type registration comments a bit, about what needs to be registered and where: - templates: new types _and_ new revisions for existing types - controls: _only_ new types For controls, the revisions is determined by the import version in the .qml file, so those must be kept up to date in new releases. Change-Id: I7c76a9d80185fa7e922c419b4ee7361be45c61f5 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Update import versions in src/import/controlsJ-P Nurmi2016-11-23140-230/+230
| | | | | | | | | | | | | | | Change-Id: Ic6cd0450a13b965578a0ab8f590270f4e52ffca6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Make sure the appropriate import versions are always availableJ-P Nurmi2016-11-233-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Utilize the newly introduced qmlRegisterModule() to automatically register the import version that matches the Qt version that is used to build the module. Now we can remove the artificial qmlRegisterRevision() calls, which were added just to make certain import versions available, even if there was no such revision. Change-Id: Ic3887c221c69b6cd299853d8d5869b8af7a314ec Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | qquickmaterialripple.cpp: cleanup unused variablesJ-P Nurmi2016-11-201-2/+0
| | | | | | | | | | | | | | | | | | | | | Left overs from 1d8bf6d1f4ef0aa84ca7e4c1233bedeee0f606f9. Change-Id: I53a6916ab3cb8c4effd50ecee1b12662ff7c7402 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-11-1728-43/+42
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quickcontrols2/qquickstyle.cpp src/quicktemplates2/qquickslider.cpp Change-Id: Ie12132690680706def6f516334a6ef0ba27336b3
| * | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-11-171-2/+2
| |\| | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/controls/data/tst_button.qml Change-Id: I5c97b3c1944e52dba44fd3c7d6d9a255c5e08cf7
| | * Doc: rephase the "logical position" propertiesJ-P Nurmi2016-11-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The previous phrasing was poor and somewhat confusing. The logical position is expressed as a fraction of the value, in the range 0-1. Change-Id: I6c2a4cbb1385af69392d214dd02224ec876131e5 Task-number: QTBUG-57069 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Material: de-couple foreground and primaryTextColorJ-P Nurmi2016-11-1626-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to get the ComboBox colors right, it must be possible to query the original primary text color value. It was very convenient to make Material.primaryTextColor return custom Material.foreground colors, because that way we didn't have to touch our QML files, but this approach is no longer usable. Task-number: QTBUG-57167 Change-Id: Iee003e96112b919dc7c84a906e4f5691b0f2a6ab Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Restore AbstractButton::checkableJ-P Nurmi2016-11-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 7a8f055, we hid the checkable property from QQuickAbstractButton and exposed it only in QQuickButton and QQuickMenuItem. The reasoning was that QQuickCheckBox, QQuickRadioButton, QQuickSwitch and their delegate counterparts are inherently checkable, so having the checkable property available in QML didn't seem to make sense. While this still holds true, there are other factors to take into consideration. AbstractButton is meant to be a generic base class for all types of buttons, but the lack of a checkable property makes it unusable as a base class for custom QML-based checkable buttons. If we want to a hide the checkable property from CheckBox, RadioButton, and Switch to avoid having it popup in the auto-completion list, we can probably do it in a less disruptive way via tooling. [ChangeLog][Controls][AbstractButton] The checkable property has been made accessible from QML. Previously it was only exposed for Button and MenuItem, but it is now available for any AbstractButton to make it possible to create custom QML-based checkable buttons. Task-number: QTBUG-51554 Change-Id: I19e29fc87cd15811c43c9b9ebb29701d66cde72f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | ComboBox: add more padding to the indicatorsJ-P Nurmi2016-11-1611-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the upcoming editable comboboxes, only the area covered by the indicator acts as a pressable button. The rest is editor area, which gains focus on press, but doesn't trigger the popup. The button must be large enough to be usable on touch. - Default: the width has been increased from 28 to 40 - Material: the width has been increased from 24 to 40 - Universal: the width is already 32 (which matches with SpinBox) Task-number: QTBUG-53876 Change-Id: I2312e92947826b03fa28da2e9e9d844325fc7896 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Add support for a QT_QUICK_CONTROLS_STYLE_PATH environment variableJ-P Nurmi2016-11-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][Styles] Added support for a QT_QUICK_CONTROLS_STYLE_PATH environment variable, which can be used to specify lookup paths for Qt Quick Controls 2 styles. This allows device manufacturers and Linux distributions to specify a system-wide style installation folder that may be located outside the Qt installation tree. Change-Id: Ic004d693bf6206971da6319d0cc13061b8fd1566 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.8' into dev" into refs/staging/devJ-P Nurmi2016-11-1148-165/+634
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.8' into devJ-P Nurmi2016-11-0348-165/+634
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/BusyIndicator.qml src/imports/controls/ProgressBar.qml src/quicktemplates2/qquickpopup.cpp src/quicktemplates2/qquickpopup_p_p.h src/quicktemplates2/qquickstackview.cpp Change-Id: I9a1028a991de9fc3e26d3f973106301e9ada631c
| | * | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-11-035-2/+190
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/accessibility/tst_accessibility.cpp Change-Id: I8c3ccb301730ecdc0acdcb75de607cdd4f753e15
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 10:53:55 +0000