aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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>
| | * Doc: highlight examples on the index pageJ-P Nurmi2016-09-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This looks nicer that an "Examples" section with a bullet list that only contains a lonely "Qt Quick Controls 2 Examples" link. Manually listing those two examples that we currently have in the 5.7 branch together with an "All Examples" link may seem a bit silly for the time being, but the idea is that later on we highlight a few examples manually and the rest are accessible through the "All Examples" link. Change-Id: I329d812b7d269de607fa141552e35bae76041176 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| | * Delete replaced delegates after Component.completed() is emittedMitch Curtis2016-09-1215-12/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Remove unused QQuickMaterialStylePrivate forward declarationMitch Curtis2016-09-121-2/+0
| | | | | | | | | | | | | | | Change-Id: Ibe09155db15603475e9060332191eb7f5223bfc1 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Fix FileDialog::selectedNameFilter review findingsJ-P Nurmi2016-09-146-21/+242
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FileDialog::nameFilters contains an array of name filter strings that combine the name and extensions. For example: - "Text files (*.txt)" - "HTML files (*.html *.htm)" When dealing with multiple name filters, it is quite clumsy to use a string type of 'selectedNameFilter' which is one of the above full file name filter string values. Make it possible to read/write the index of the selected name filter, and provide the filter's name and extensions separately. Change-Id: Ie416cc4ab3dcde93c10769b6f7ac44915307f194 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Platform: add experimental StandardPathsJ-P Nurmi2016-09-136-3/+265
| | | | | | | | | | | | | | This complements the File/FolderDialog offering. Change-Id: I44a105724321092a6efc4126c8fb25f7d31b77e2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Adding TabBar and TabButton to item libraryThomas Hartmann2016-09-131-0/+28
| | | | | | | | | | Change-Id: I3489454f9b9ece4478c91061d1cfd5327422b483 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update .qmltypesMarco Benelli2016-09-123-1748/+14
| | | | | | | | | | Change-Id: I9551e7606cb1bda67058295cccd4a418a418bd24 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Default: consolidate style colors into a singletonMitch Curtis2016-09-1246-98/+587
| | | | | | | | | | | | | | | | 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-0619-322/+568
|\| | | | | | | Change-Id: Ief98cd56abd13cfa4e30578e150207462a8243b8
| * QQuickDrawer: fix the internal transition stateJ-P Nurmi2016-09-064-60/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When QQuickDrawer was visible all the time, it did not emit the visibility related signals at all. Now the signals are emitted, but aboutToShow() and visibleChanged() were emitted twice when a drawer was manually dragged open. First time when the dragging begins (the drawer becomes effectively visible), and second time when the open transition begins after mouse/touch release. This change ensures that the signals won't be emitted again when the transition begins, in case they were already emitted. Change-Id: I2a175c9e86a480d5cd23e306f41f0d85e2416f75 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix drawer visibility and overlay event handlingJ-P Nurmi2016-09-066-96/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drawers were visible all the time, lurking at the window edges to be able to catch presses and drag themselves visible when appropriate. This change moves the handling of window edge presses from QQuickDrawer to QQuickOverlay, making it possible to show and hide drawers like any other popups. Instead of having all drawers visible all the time, we just keep QQuickOverlay visible when there are any registered drawers, even hidden ones. Furthermore, this change makes modal popup/drawer background dimming items accept mouse press events just like they accept hover events to ensure that a modal overlay does not leak input events through. When the background dimming of a modal drawer has been dragged over the drag-threshold, the drawer simply steals/grabs mouse to start dragging of the drawer. Task-number: QTBUG-54794 Task-number: QTBUG-54800 Task-number: QTBUG-55022 Task-number: QTBUG-55703 Task-number: QTBUG-55713 Change-Id: I65fb38fcf1466d4e41192c4321d80fb90b49da9a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickDrawerPrivate::ungrabMouse()J-P Nurmi2016-09-062-47/+56
| | | | | | | | | | | | | | | | Split ungrabMouse() out of handleMouseReleaseEvent(). This makes the mouse release handling code a bit easier to read. Change-Id: Ibc1286083edb4f832b6e5ee761ee5c16a0e68ba1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickDrawerPrivate::grabMouse()J-P Nurmi2016-09-062-32/+40
| | | | | | | | | | | | | | | | Split grabMouse() out of handleMouseMoveEvent(). This makes the mouse move handling code a bit easier to read. Change-Id: I39971e995d8d202e702bddeec0d1f9554c298c0e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickDrawerPrivate::startDrag()J-P Nurmi2016-09-062-18/+29
| | | | | | | | | | | | | | | | | | Split startDrag() out of handleMousePressEvent(). This makes the mouse press handling code a bit easier to read. The new method will be later utilized by QQuickOverlay. Change-Id: I1118d86657a77d72353faac928b0a8deba4ff501 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Material: fix ToolBar to respect Material.backgroundJ-P Nurmi2016-09-063-1/+10
| | | | | | | | | | | | Task-number: QTBUG-55687 Change-Id: I815291847bad72ae58b66dc70b510ce11cd88b8d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Material: fix popups to respect Material.backgroundJ-P Nurmi2016-09-061-0/+4
| | | | | | | | | | | | Task-number: QTBUG-55687 Change-Id: I217ad905cc06228a6a1608c0721dc20a31db6d9b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Make QQuickDrawerPrivate accessible via qquickdrawer_p_p.hJ-P Nurmi2016-09-053-28/+97
| | | | | | | | | | | | | | | | Required by the subsequent patches. Done separately keep the other patches smaller and easier to review. Change-Id: Ibce7f131684ef48a60c7023e7566d8b6907ac6af Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Remove superfluous QQuickOverlayPrivate::popupsJ-P Nurmi2016-09-052-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | First of all, the name was a bit misleading. It was a list of _visible_ popups. Anyway, it is unnecessary to maintain such list anymore. The only use case for it was to resize the background dimming items of visible popups when the window was resized. For that infrequent desktop -only event, we can fetch the background dimming items from the list of all popups. Change-Id: Ie17db042719d4614189a78a2e5314136ca95df42 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickOverlay: keep track of all drawersJ-P Nurmi2016-09-052-13/+6
| | | | | | | | | | | | | | | | Required by the subsequent patches. Done separately keep the other patches smaller and easier to review. Change-Id: Id5d13e19f98155cfd3d0474c7d3839808133bab1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickOverlay: keep track of all popupsJ-P Nurmi2016-09-053-1/+27
| | | | | | | | | | | | | | | | Required by the subsequent patches. Done separately keep the other patches smaller and easier to review. Change-Id: I60212451cf53443ae7abd58b8eaad94b66984e03 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Make QQuickOverlayPrivate accessible via qquickoverlay_p_p.hJ-P Nurmi2016-09-053-29/+97
| | | | | | | | | | | | | | | | Required by the subsequent patches. Done separately keep the other patches smaller and easier to review. Change-Id: I90ae08ea196354b3db74e2203983ca95733ef0c8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix hover event delivery with plain QQuickWindowJ-P Nurmi2016-09-051-9/+16
| | | | | | | | | | | | | | | | | | | | A plain QQuickWindow cannot provide a modal background dimming visual, but we can create a QQuickItem as a fallback to take care of blocking the hover events for modal popups. Change-Id: I3ead985c4e2e030aaf28f1ec6c8a1ae285637819 Task-number: QTBUG-54913 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Use QQuickOverlay with plain QQuickWindowJ-P Nurmi2016-09-055-20/+33
| | | | | | | | | | | | | | | | | | | | | | Get rid of the ugly and broken event filter approach that was used with QQuickWindow. Create an instance of QQuickOverlay so that the same overlay code path is used for both QQuickApplicationWindow and plain QQuickWindow. Task-number: QTBUG-55729 Change-Id: I6e26b19cd94a9580418912803f50c30b9dcaeedb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>