aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Material: switch back to triggering ripples on pressJ-P Nurmi2016-09-309-9/+0
| | | | | | | | | | | | | | | | | | There is something wrong with the ripple effect's speed calculation when it's triggered on release. The ripple is supposed to grow slowly on press, and fast on release. But when triggered on release, it grows clearly too slow. We also got a bug report complaining about the trigger on release behavior. Ripples are triggered on press on Android 5, which is the Android version with the most market share. The proposal is to fix the ripple effect speed calculation when triggered on release later, and switch to trigger on release when later versions of Android have passed Android 5's market share. Task-number: QTBUG-55520 Change-Id: I67994e0df3c318af24f0d1f843bb2d0c26c4d656 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Create contentItem lazily where possibleJ-P Nurmi2016-09-2630-66/+43
| | | | | | | | | | | | | | | | | | | | | The existence of a content item is obligatory for such controls that alias the contentData and contentChildren properties to the data and children properties of the content item. Even though we created empty content items in QML to ensure one always exists, it did not not guarantee that a content item would exist for custom styles. Furthermore, the empty content item was unnecessarily created and destroyed when the property was overridden for a customized control in QML. This change creates the content item lazily where required, ensuring that it always exists even for custom styles, but does not create it in case a content item is supplied from QML. Task-number: QTBUG-54347 Task-number: QTBUG-56038 Change-Id: I714ef4f8c366f0f449b922b2c16c0ec653fbd364 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-09-269-37/+200
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: examples/quickcontrols2/gallery/gallery.qrc src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc src/quicktemplates2/qquickstackview_p.cpp src/quicktemplates2/qquickstackview_p_p.h tests/auto/controls/data/tst_stackview.qml Change-Id: If451fe0e5653572d305b4de90a6d5cb878463e8d
| * Fix a crash in StackView::pop()J-P Nurmi2016-09-262-36/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an item is still activating (from a previous pop) when it gets already popped out, we must not set the deactivating status before calling prepareTransition(). This method cancels and finishes the ongoing activation transition, and if the status says that the item was deactivating, the item gets destroyed in the middle of preparing for the deactivation transition. Let prepareTransition() cancel any ongoing transition first, and then set the status after the preparation. The cleanest way is to pass the target status to startTransition() and completeTransition(). Task-number: QTBUG-56158 Change-Id: Id52752200b650ea9f84659bbf43431f8a8b22f1e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Let QT_QUICK_CONTROLS_CONF override :/qtquickcontrols2.confJ-P Nurmi2016-09-231-1/+13
| | | | | | | | | | | | | | | | | | This is an undocumented feature mainly for tooling purposes. This way tooling can make sure that qmlpuppet uses the same configuration as the application when displaying a form in the Qt Quick Designer. Change-Id: If46055f09049118f1f49c350c74d5aab501a0378 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
| * PageIndicator: fix documentation review findingsMitch Curtis2016-09-232-1/+88
| | | | | | | | | | | | Change-Id: Ie684aeeeb5c9a57d8904e2526403aba1b85ce465 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Pane: fix documentation review findingsMitch Curtis2016-09-231-12/+62
| | | | | | | | | | | | Change-Id: I59b40f68aa1f2985bfc15de26f587df6a88c09eb Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Doc: improve the .conf docsJ-P Nurmi2016-09-231-4/+5
| | | | | | | | | | Change-Id: I4aa031fb14b232c102e94c5a5f1c5be2885ed2d4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix nested popupsJ-P Nurmi2016-09-231-3/+13
| | | | | | | | | | | | Task-number: QTBUG-56136 Change-Id: I3ed7fae09c342c2c456b94fc0cfed781d8edf6aa Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix QQuickOverlay::childMouseEventFilter() to release the grabber popupJ-P Nurmi2016-09-231-0/+1
| | | | | | | | | | | | Change-Id: Id9d844d1fc75f4d254abaf1681747b7b521e881b Task-number: QTBUG-56131 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Drawer: allow interaction outside modal background dimmingJ-P Nurmi2016-09-231-2/+5
| | | | | | | | | | | | | | | | | | If a drawer is positioned below a toolbar, for instance, it must be possible to interact with the buttons in the toolbar while the drawer is open (without the drawer closing due to the interaction). Change-Id: I5e07f66ad997ba6cf991a26fc6849ec51c9c0a22 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Revert "Popup: expose flip API"J-P Nurmi2016-09-225-72/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.8Liang Qi2016-09-2232-256/+1054
|\| | | | | | | Change-Id: I37aab846346692fd4bff08b0dbab66db3a8e2716
| * Control: add example snippets for background, contentItem and fontMitch Curtis2016-09-211-0/+41
| | | | | | | | | | | | Change-Id: I0968454452dcf17093ef27af8770fd5018780160 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Page: fix documentation review findingsMitch Curtis2016-09-211-2/+45
| | | | | | | | | | | | Change-Id: Ia63c5d34ccb239fb45c7445a4354e6594bfce812 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * MenuItem: fix documentation review findingsMitch Curtis2016-09-211-13/+22
| | | | | | | | | | | | Change-Id: Iff356498b438e0f4373efce0131634439b5e6240 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Menu: fix documentation review findingsMitch Curtis2016-09-211-6/+36
| | | | | | | | | | | | Change-Id: I1ae17f1e6241b46b6d2f321451fd4fd017032486 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * QQuickDrawer: allow resizing and positioningJ-P Nurmi2016-09-215-32/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make QQuickDrawer re-use QQuickPopup's reposition() implementation. This way QQuickDrawer gains support for proper positioning and margins "for free". Now it is possible to place Drawer below the window header, for instance: import QtQuick 2.0 import QtQuick.Controls 2.0 ApplicationWindow { id: window visible: true header: ToolBar { } Drawer { y: header.height width: window.width * 0.6 height: window.height - header.height } } [ChangeLog][Controls][Drawer] Made it possible to control the vertical position of a horizontal drawer, and vice versa. This allows placing a drawer below a header/toolbar, for instance. Task-number: QTBUG-55360 Change-Id: I63621195efeefa2ea88935d676771b392e0a4030 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Drawer: reparent to the overlay by defaultJ-P Nurmi2016-09-214-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Drawer is a special type of popup that always resides at one of the window edges. Therefore it makes sense for drawers to operate on window coordinates. Re-parenting drawers to the window overlay achieves that. Now that the window overlay is guaranteed to always exist and the ApplicationWindow.overlay attached property works even with plain QML Window, we can reliably use it as a parent for Drawer. Task-number: QTBUG-53168 Change-Id: I37c727001350217ea1d2d9c52d73b4cae44d7c8d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Make ApplicationWindow.overlay attached property work with QML WindowJ-P Nurmi2016-09-211-39/+49
| | | | | | | | | | | | | | | | | | Since 14dd934c, we're using QQuickOverlay even with plain QML Window. Now that the overlay is guaranteed to always exist, we can make the attached property to give a reliable access to the overlay. Change-Id: I707fc52f6dfc7a0dbc9a3467646fb5feb36b9572 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix QQuickPopup::resetWidth/Height()J-P Nurmi2016-09-211-0/+10
| | | | | | | | | | | | | | | | | | | | When reseting the explicit size of a popup, the popup items geometry does not necessarily change. However, it affects the positioning of the popup whether it has explicit size or not. For that reason we must ensure that the popup gets repositioned as appropriate. Change-Id: I2dcd895eb7a1adc9c6a804bed4731edac1d550ec Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickPopup: fix negative marginsJ-P Nurmi2016-09-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | The documentation states: A popup with negative margins is not pushed within the bounds of the enclosing window. Therefore QQuickPopupPrivate::reposition() must not subtract negative margins to calculate the available bounds. Change-Id: I626772970bf3d5d9eefbb13811ea1003a85bcf0b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Move resizeOverlay() to QQuickPopupPrivateJ-P Nurmi2016-09-214-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a preparation step for making drawers movable. Drawer must be later able to resize the overlay to fit the area of the window that is covered by the drawer. For example, if the Drawer is below the header, it can resize the overlay so that it won't be on top of the header. Change-Id: I2cfd025a31f3a517575f3dbf9b972dcd6957715c Task-number: QTBUG-53168 Task-number: QTBUG-55360 Task-number: QTBUG-53609 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Control: elaborate on the documentation for various propertiesMitch Curtis2016-09-201-6/+45
| | | | | | | | | | | | Change-Id: I48f1a9cf56e6b92ef34e954259e64d090bb445ca Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Control: explain diagram and make it a linkable sectionMitch Curtis2016-09-203-0/+414
| | | | | | | | | | | | Change-Id: I6e0d2349bdc909e61048356d76dc877e33fad5ff Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Control: link to "Control Layout" section in relevant placesMitch Curtis2016-09-201-7/+7
| | | | | | | | | | | | Change-Id: I82ec57bca3dffc19400f90eba13985df4be103de Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Switch/Delegate: improve dragging behaviorJ-P Nurmi2016-09-202-4/+20
| | | | | | | | | | | | | | | | | | Don't start dragging the handle unless the initial press was at the indicator, or the drag has reached the indicator area. This prevents unnatural jumps when dragging far outside the indicator. Change-Id: I2b31b319a347ab489f2de5c044e42d908827b425 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickSwitchDelegate: make the handle draggableJ-P Nurmi2016-09-192-12/+52
| | | | | | | | | | | | | | | | | | Sync the implementation with QQuickSwitch to make it behave exactly the same way. Change-Id: I59d08f68f87d8776e4012da880ac57a99950dfe8 Task-number: QTBUG-55686 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickSwitch: fix event handlingJ-P Nurmi2016-09-192-91/+38
| | | | | | | | | | | | | | | | | | | | | | | | Switch implemented custom event handling for the indicator, and used QQuickAbstractButton's event handling for the background. This lead to inconsistent signals depending on whether interacting with the handle or the background. This change gets rid of the child mouse event filter for the indicator and makes QQuickSwitch fully utilize the base class event handlers. Change-Id: I773e2eb939cbbf4bc9086cdf2b34e876597ea08e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickSwitch: utilize checkStateSet()J-P Nurmi2016-09-192-8/+8
| | | | | | | | | | | | | | | | | | | | QQuickAbstractButton::checkStateSet() did not exist when QQuickSwitch was originally implemented. QQuickSwitch no longer has to establish a signal-slot connection, but can just override the virtual to update the position when the checked state changes. Change-Id: Ic18f13bcd7b0fe9fe657c41094b4d1db5cbb2e5a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix Switch to stay pressed as appropriateJ-P Nurmi2016-09-193-3/+6
| | | | | | | | | | | | | | | | | | | | Switch is a special type of button that should stay pressed (similarly to Slider) even if the finger slips outside the bounds of the control. It was doing that only when dragged from the handle, not when dragged from the background. Change-Id: I462c66cfe2e67fc3c95215ffeafe3e5771174418 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix Popup to respect explicit sizeJ-P Nurmi2016-09-192-3/+11
| | | | | | | | | | | | | | | | | | [ChangeLog][Controls][Popup] Fixed to respect explicitly set width and height. Task-number: QTBUG-56025 Change-Id: I7c8b0dcf59459a313c4c52eda44de45f1ab648ea Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Drawer: fix drag to close from the outside on touchJ-P Nurmi2016-09-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set mouseGrabberPopup in QQuickOverlay::childMouseEventFilter() the same way it is set in QQuickOverlay::mousePressEvent() to ensure that the consequent mouse move events are routed to the appropriate popup. This worked with "genuine" mouse move events that were caught by the same child mouse event filter and that way routed to the appropriate popup, but not with "synthesized" mouse move events that are caught by QQuickOverlay::mousePressEvent() instead. Change-Id: Ic59afd85e55c13ebec482bc4dc534accd1f92b2c Task-number: QTBUG-56010 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Dial: clarify the documentation for some propertiesMitch Curtis2016-09-191-2/+15
| | | | | | | | | | | | | | | | | | | | - Document the range of the angle property - Fix handle's property type - Explain stepSize more thoroughly Change-Id: I72ce8b493b3faf49d7f155ac802109bd9bdb4089 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Container: rephrase paragraph about declaring childrenMitch Curtis2016-09-191-2/+4
| | | | | | | | | | | | | | | | The more common use case is static declaration of children. Change-Id: Ie1c7b44ae9e738e02f89957b27f6111a1e798736 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Button: fix autoRepeat and checkable documentation review findingsMitch Curtis2016-09-191-2/+15
| | | | | | | | | | | | Change-Id: Ic8c90c284863077681ee1d143a366138cd550825 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * CheckBox: expand detailed descriptionMitch Curtis2016-09-191-2/+4
| | | | | | | | | | | | | | | | | | Mention that the API is inherited from AbstractButton, and how it's different from CheckDelegate. Change-Id: I3de58b57ee3a00194312ab6bff1aa43ce58f3199 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * CheckDelegate: expand detailed descriptionMitch Curtis2016-09-191-4/+9
| | | | | | | | | | | | | | | | | | Mention the API that is inherited and the difference between it and CheckBox. Change-Id: I931fa410e90b686d0ac27a2fd5945ef9e8b6f949 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * GroupBox: fix documentation review findingsMitch Curtis2016-09-191-4/+7
| | | | | | | | | | | | Change-Id: I1663fed5d4639d35f93029b64e64f3cd14a8138d Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Frame: link to contentItem in detailed descriptionMitch Curtis2016-09-191-2/+2
| | | | | | | | | | | | Change-Id: Ifa936562b25ae99f3d912ecea356373a018b5660 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * List .qdoc files and snippets in OTHER_FILESJ-P Nurmi2016-09-162-2/+8
| | | | | | | | | | Change-Id: Ic33bc3d69771dab79ccaf307b00ed0f840b9e8b2 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * qquickapplicationwindow.cpp: fix typo in property docFrederik Schwarzer2016-09-161-1/+1
| | | | | | | | | | Change-Id: Ia9b2da125a0beb41e47f1b9bb37e7c6fb8435e2e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * QQuickControl: clear the hovered state when hiddenJ-P Nurmi2016-09-151-0/+4
| | | | | | | | | | | | Task-number: QTBUG-56007 Change-Id: I6433e0ebc9570b1e9e6e149ef7f631ea6786f672 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Drawer: fix flickering on touch releaseJ-P Nurmi2016-09-141-0/+6
| | | | | | | | | | | | Change-Id: I9a8b46fd796652822760f70d0c59db54214337b1 Task-number: QTBUG-55995 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8J-P Nurmi2016-09-1423-49/+166
|\ \
| * | Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-09-1423-49/+166
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquicktextarea_p_p.h src/quicktemplates2/qquicktextfield_p_p.h Change-Id: Ie7b4a114ad27a4cad337c91e8ebcf696b0e845d7
| | * Fix modal overlays leaking wheel events throughJ-P Nurmi2016-09-133-1/+18
| | | | | | | | | | | | | | | | | | Change-Id: I1a3be5ef02cf73a153cebc030313f892fbb03d9f Task-number: QTBUG-55769 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Doc: align "pre-defined colors" in the style docsJ-P Nurmi2016-09-132-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original problem: the Universal.color() method docs was linking to the pre-defined colors of the Material style. Present the list of Universal style's pre-defined colors the same way it is done for the Material style, and disambiguate the two. Change-Id: I3f3df608e80ca5c24034e2d75398e3126cf32b2d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Doc: update the list of supported Universal style env variablesJ-P Nurmi2016-09-131-0/+8
| | | | | | | | | | | | | | | Change-Id: I26de6f195750f640d9565a22d8004733ac1c4357 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Doc: add missing SplitView in the type comparison tableJ-P Nurmi2016-09-131-0/+3
| | | | | | | | | | | | | | | Change-Id: Idf2c7fb22be31e806fbd33875f199dd693ccfd9a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 11:21:31 +0000