aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Update all QtQuick imports in src/imports/controlsJ-P Nurmi2016-10-04146-146/+146
| | | | | | | | | Most were importing 2.6, some 2.4, and some 2.7. Use consistently the latest available Qt Quick version 2.8. This can be easily tracked to the corresponding Qt version. Change-Id: Ic231b3cc0cb5d2d5cf806fe11c4ff3fd557d09e0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8J-P Nurmi2016-10-03134-122/+381
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * StackView: allow loading remote URLsJ-P Nurmi2016-10-031-0/+10
| | | | | | | | | | | | Task-number: QTBUG-55749 Change-Id: I369e0113492547f312c8f1b540f5faa506a75a25 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * QQuickPopupPrivate: unbreak ubsan buildMarc Mutz2016-10-022-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The tst_drawer test uses members of the class, but it was not (autotest-) exported. That's no problem as long as the function called is inline, or a data member is accessed, but in a UBSan build, the typeid of a poly- morphic class is checked on each access, so the typeinfo object must be exported. Fix by autotest-exporting the class and defining the dtor out-of-line to pin the typeinfo and vtabe to a single TU. Change-Id: I1524e63a330dbdb0ae1ceb60263b589734bfd3aa Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Fix ComboBox to scroll to the highlighted itemJ-P Nurmi2016-10-024-4/+17
| | | | | | | | | | | | Change-Id: I57fefd8ba47796118e71902c6882e9918d462920 Tasl-number: QTBUG-55030 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Fix QQuickToolTip's delay and visibilityJ-P Nurmi2016-10-024-36/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The imperative open() and close() methods used to be the only ways to open and close popups, but the visible-property was later made writable to allow declarative visibility bindings. Since then, it is no longer sufficient for QQuickToolTip to overshadow open() and close() in QML, because setting the visible-property would bypass these overshadowed method. There was a bit of duplicate code between setVisible(), open(), and close(). This change moves the logic to one place by changing open() and close() to call setVisible(). Furthermore, setVisible() has been made virtual to make it possible for QQuickToolTip to apply its delay properly. QQuickToolTip needs to control the delay and timeout timers before the effective visibility is applied on the popup. Task-number: QTBUG-55572 Change-Id: I5a109157f9ec5d0db145e710426665a9a8d7e870 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Popup: don't steal focus on close from another opening popupJ-P Nurmi2016-10-021-6/+8
| | | | | | | | | | | | | | | | | | In the Gallery example, the settings dialog does not get focus (or to be exact, loses it immediately), because the closing menu incorrectly transfers focus back to the tool button that opened the menu. Change-Id: I5328d8e825de9a977619688dc4478e6592db654f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Fix QQuickControl::setFocusReason()J-P Nurmi2016-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | There is a little behavior change in focus handling in Qt Quick after qdeclarative commit e7da97b. The order of QQuickItem::focusOutEvent() and QQuickItem::ItemActiveFocusHasChanged have changed. Now we need to emit visualFocusChanged() in setFocusReason() when losing visual focus to ensure that bindigs to visualFocus get re-evaluated as appropriate. Change-Id: I52e728c7df751a54b36f353415b2666cfedc73ad Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Doc: cleanup the mention of 'indicator' in 'Customizing ItemDelegate'J-P Nurmi2016-10-021-2/+2
| | | | | | | | | | | | | | | | | | | | The explicit mention 'indicator' in the ItemDelegate customization docs is a remainder from the early days when it still had a check indicator built into. Then at some point we decided to provide separate type of checkable delegates. Change-Id: I710318d3828ffae1ceb0877a67fe128460653bc1 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * qtquickcontrols2plugin.cpp: cleanup includesJ-P Nurmi2016-10-021-9/+1
| | | | | | | | | | Change-Id: I5c1b3a911972b61562d8d7e9b1e07cbde0bef78f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Make a plain AbstractButton calculate suitable implicit sizeJ-P Nurmi2016-10-023-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just like commit 87b21a57 made Control do it, this applies the same logic to AbstractButton. The simple reasoning is that when customizing both the contentItem and the background, it is much better to use the AbstractButton type that does not have any default building blocks. Previously you would have to supply implicit size calculation as well, but this makes it much more convenient to use. [ChangeLog][Controls][AbstractButton] A plain AbstractButton now calculates its implicit size based on the implicit size of the content item plus paddings, and the implicit size of the background item. Change-Id: Ic380366b25940fbb9f28882c4622d58f4c042a07 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Material: fix dark dialog colorJ-P Nurmi2016-10-021-1/+1
| | | | | | | | | | | | | | | | https://material.google.com/style/color.html#color-themes Task-number: QTBUG-53266 Change-Id: I870d8e4871cae8d4940264c046d6ddf74dbe023f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * ComboBox: fix unintentional deps between the popup and its content itemJ-P Nurmi2016-10-023-5/+6
| | | | | | | | | | | | | | | | | | Do not use an ID to reference the default content item from the outside, because it should be possible to replace the content item. Change-Id: I8a6cc084fcb7eae431e4db7eeacb8fd2ab8c4bf5 Task-number: QTBUG-56297 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Fix style inheritanceJ-P Nurmi2016-10-021-2/+5
| | | | | | | | | | | | | | | | | | When unable to find a parent item style on window change, use the window style as a fallback to avoid a parentless style. Task-number: QTBUG-52631 Change-Id: I5d31dc72075f06f865f01c3ee2411de6a1485677 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Cancel exit transition when the same tooltip is shown againMitch Curtis2016-09-302-3/+6
| | | | | | | | | | | | | | Task-number: QTBUG-54206 Task-number: QTBUG-54532 Change-Id: I7e4d993e3b1e30d7d7956629604f948dd1c85e32 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Material: fix accent update on theme changeJ-P Nurmi2016-09-301-0/+4
| | | | | | | | | | Change-Id: I9cb3fd6bdbedc0e7ca472b815502bce48dca00b7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * CheckBox: add GIFs to documentationMitch Curtis2016-09-307-11/+6
| | | | | | | | | | | | | | | | | | - Replace the state table in the detailed description with a GIF. - Add a GIF for the tri-state documentation. Change-Id: I00f3835edad6eb454d06847ab342ce0eeb30156b Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Button: add GIFs for flat & highlighted docsMitch Curtis2016-09-307-11/+4
| | | | | | | | | | | | | | | | | | This also removes the state table in the detailed description, since we have GIFs now. Change-Id: I4503b67478051eb872f46127da6718092d77d4ff Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * TabButton: use Text's implicit size instead of content sizeJ-P Nurmi2016-09-302-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using content size was a workaround (applied in 5f5654f) that helped with mis-aligned tab labels, but broke the implicit size calculation of TabButton itself. Now that the mis-alignment issue in QQuickText has been fixed in qtdeclarative commit 79cfc87, we can restore the correct implicit size calculation. This makes it possible to create tabs that are not squeezed to fit in TabBar: TabBar { TabButton { text: "Foo"; width: implicitWidth } TabButton { text: "Bar"; width: implicitWidth } TabButton { text: "Baz"; width: implicitWidth } } Task-number: QTBUG-55129 Change-Id: If0dbb00794299e324b7a8d8ce1370fe0a3491fe8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * TabBar: re-layout as appropriate in tab button size changesJ-P Nurmi2016-09-303-5/+19
| | | | | | | | | | | | | | Auto-tested by the next change. Change-Id: I28ff7e82c0255b93d23cff7cbe111406d525f24b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * TabBar: fix mixing of fixed and implicitly resized tabsJ-P Nurmi2016-09-301-5/+17
| | | | | | | | | | | | | | | | | | | | Don't calculate the implicit item width based on the total width of the whole control, but based on the available width that is left after subtracting the items that have an explicit width and won't be resized. Change-Id: Iae18dd9c9756b6f2afa143baab7d2501ce9d4697 Task-number: QTBUG-56265 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Fix crash when flicking a ListView-based TumblerMitch Curtis2016-09-301-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This only happens in 5.7, and seemingly only when the delegate uses attached properties (like displacement). Other fixes required and/or relevant to the patch: - Fixed some instances of displacementChanged possibly not being emitted. - Use QPointer for the attached object's Tumbler pointer, as it was being accessed while null after this patch. Change-Id: I7d881d815faf57f1a8bc0ea8e73a7331523d2f9b Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Don't execute disabled transitionsMarco Martin2016-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | If an enter or exit transition for a Drawer is disabled, don't execute it at all when the drawer gets opened or closed. This besides being more semantically correct, makes possible to control manually the opening of a Drawer, for instance to implement an external handle with which is possible to drag the drawer open or close. If a Transition is disabled, is up to the caller to set correctly the position value. Change-Id: I5a0d96e3b7c948725dff2068f9d0a7ab1d3847e9 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Fix QQuickToolTipAttached parentJ-P Nurmi2016-09-282-4/+4
| | | | | | | | | | | | | | | | The parent must not be a null item. Change-Id: Ide71a69e8cde8114542fa97570e0e5f5d724a884 Task-number: QTBUG-56243 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * SpinBox: don't call valueFromText when non-editableJ-P Nurmi2016-09-281-2/+2
| | | | | | | | | | | | | | | | | | | | If there are custom values like 00:00:00 for time and valueFromText is not implemented, tab navigation sets the value to 0, because the default implementation cannot evaluate it. Change-Id: I0384a2015b2c2a4dc2ee0e57f1ece410c339838e Task-number: QTBUG-56215 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Popup: fix some of the documentation review findingsMitch Curtis2016-09-274-7/+159
| | | | | | | | | | | | Change-Id: I69b60faab1588a45e005ba721c9796680bad6ac1 Task-number: QTBUG-55904 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Refactor tst_snippets to make it easier to add non-screenshot snippetsMitch Curtis2016-09-26100-1/+2
| | | | | | | | | | | | | | | | Add a separate test for non-screenshot snippets and move the screenshot snippets to their own folder. Change-Id: Ic3e7370321e346b83f7df42205e204d1265ce5b0 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | 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>