| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
src/dialogs/qquickabstractfiledialog.cpp
src/dialogs/qquickfiledialog.cpp
Change-Id: I60aab7c7e819f82f82fc30f473b36a7a57d9a91a
|
| |\
| | |
| | |
| | | |
Change-Id: I434c0d9c03200ff9ad0abc336c87ea52ea5abd67
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This bug was due to a couple of factors interacting:
1) the QQuickMenu::__popupVisible property is not in sync with the
popupWindow::visible property. In fact, the QQuickMenu::__popupVisible
becomes true before the PopupWindow::Show() method is called.
2) In the Menu.qml file, the menu content item is created through the user
of Loader, whose active property becomes true when the
QQuickMenu::__popupVisible property is true. So the result is that the
MenuContentItem is created before the QQuickPopupWindow is effectively
visible.
3) Given point (2), the MenuContentItem requests focus on creation (since
it has focus: true). However, given (1), the QQuickPopupWindow is
neither visible nor active.
This patch addresses this problem by forcing activeFocus to the
menuContentItem only when the popupWindow gets focus.
Task-number: QTBUG-41951
Change-Id: I095700726aab4ac45a62cd37b33a069e294df30e
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|/ /
| |
| |
| |
| |
| |
| | |
Update old header.LGPL3 to header.LGPL
Change-Id: I3c851bc24da89f6300b94199387d1adf16ca4f48
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
This avoids clashes between Qt Quick Controls and Qt Labs Controls.
Change-Id: Ia1d367c271a3c80259d4f59be891c211ec061e01
Task-number: QTBUG-49794
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
|
| |
| |
| |
| |
| | |
Change-Id: I6628ac2b8b07634afc1062488a12788a4e3f66c0
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|/
|
|
|
|
|
|
|
|
| |
The mouse event that dismissed a popup window should
not dispatched to the visual item. Otherwise the
menu open again.
Task-number: QTBUG-44532
Change-Id: Id8aca1634e4f1795e546230953bff49518589714
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
|
|
|
|
|
|
| |
Fixes a CI crash reproducible at least on Ubuntu
Change-Id: I45a59054c20c3a99da30b79d33e24184bf328db9
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was working on Qt 5.4.1 but got broken by de9145dcd90.
Can't see nothing fundamentally wrong with that commit, problem
was that the code to reposition the popup assumed the contentItem's hight or
width would change every time and connected to hightChanged/widthChanged to
trigger the repositioning. Since de9145dcd90 those signals are only emitted the
first time the popup is shown.
Call updateSize() explicitly.
Task-number: QTBUG-47092
Change-Id: I303bfae80e5cb72e0c24e26365b8d0faa9ddf400
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/controls/qquickmenupopupwindow_p.h
Change-Id: Ic935bb56f5df70645eea30c890759f5980d68fe4
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This avoids issues when the action is triggered from a Menu and the slot
ends up processing pending events, effectively deleting an object while
one of its QML signal handlers is being executed. The reason being that
we used to call deleteLater() on the menu popup window while still in
the mouse event handler.
Now, we do the same thing in three separate steps. 1. Close/dismiss the
menu popups, 2. trigger the action, and 3. delete the popups. This keeps
the menu popups and their contents alive until we return from the action
triggered handler. We also need to take care of manually destroying any
popup we may create. Finally, the menu content creation in Menu.qml had
to be tweaked since we shouldn't rely on the popup visibility anymore.
Task-number: QTBUG-45182
Change-Id: I9f1155bbf74dd3353c6c4066a24abf1cd2c3a283
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When using more than 1 monitor, snap to 1 monitor instead of
crossing screen boundaries.
That's how native implementations and QtWidgets do it.
Task-number: QTBUG-45228
Change-Id: Icbeb9045a04ad4d4f81295603cbf1b81dcc44442
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This fix revert partially what was done for resolving QTBUG-40391.
Infact the change QTBUG-40391 caused the propagation of the events
that caused the dismiss of a popupMenu. This in turn caused this bug
where the click that should close menu is forwarded instead of being
swallowed. However for supporting the behavior of context menu
outside menubar we added some cases where the developer expect
to receive the event that dismissed the popup. The use case is to
reopen a dismissed popup on right click (see windows right click
behavior on right clicks)
Task-number: QTBUG-45315
Change-Id: If5a181b65ed9d879521ac20de577510908125169
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QQuickMenuPopupWindow has not direct reference to the QQuickMenu that
created it.
This is useful for navigating back from the popup to the QQuickMenu
Change-Id: I6b11641ef90c423df9961277bb3e89573d1ed0e0
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/controls/TableView.qml
tests/auto/controls/data/tst_gridlayout.qml
Change-Id: I030bc50dc8fcf7b6b00e183dc3a67c3cd012f3fb
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
A menu popup may be positioned partly or fully outside
of the available geometry. For example if a Windows
side bar (appbar) is opening such a popup, it will be
completely outside of the available geometry (rcWork from
MONITORINFOEX) since such sidebars are not part of that.
Instead, use the regular, full geometry.
Task-number: QTBUG-43693
Change-Id: Ibd22150cb7ec94a46df2facbfc1bf5f20bda51e5
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
|
|/
|
|
|
|
|
| |
Change-Id: I77e7a218a958d76ac7ef7780f4be52a81f76fa6b
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I57d8ecd771eac00cc68de0ec5afa07706fee3671
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/controls/qquickmenupopupwindow.cpp
Change-Id: Ibc10e7da3b3a2983c022b8973cd80cb1a7e110af
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-40883
Change-Id: I5c46c049b5890259d65f325adb59e15ebf29f84a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When embedded into a widget-based UI in a window container,
extra care is needed to find the correct top-level because
the QQuickWindow is not it.
Task-number: QTBUG-40883
Change-Id: I8d5a91f23c405e14b0994f08aa74581742f6482b
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL
Change-Id: I470909ba0980db33ab551790d619c59a35978590
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
|\ \
| |/
| |
| | |
Change-Id: I9253c87c3bd54204401070f492c7590166be0fe3
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Using the children rect size was a mistake, particularly when using
Instantator in a Menu.
Task-number: QTBUG-40221
Change-Id: I6efe9aad617a7b0adbea0bb96bf843c5c1779131
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|/
|
|
|
| |
Change-Id: Iafc7f3a1a41093628e3cba8dd2a7781c2b82b021
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
|
|
|
|
|
|
|
|
|
| |
The previous fix applied only to the non-platform menu case and was
broken on OS X at least, when having a combobox in a QQuickWidget.
Task-number: QTBUG-39908
Change-Id: I5dde103c2fe33d52a312cc80b36b47b13e72a188
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Handle the case where the QQuickWindow is hidden and the content
is rendered somewhere else using QQuickRenderControl.
Task-number: QTBUG-38116
Change-Id: I51fb9001c307f53bf7d724860b2a66287982724e
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|
|
|
|
| |
Change-Id: I28a8edd657f02cecbd0c31965bd4085429cf4537
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
|
|
|
|
|
|
|
| |
... and put it in QQuickPopupWindow.
Change-Id: I6920f5c13904483310faae990c7199db9f1c4708
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We factor out part the menu item container logic from Menu into
ColumnMenuContent, which takes care of scrolling and mouse hovering,
and selection. This makes possible to extend the menu items layout.
The pop-over and pull-down look is specified by the menu style
component by overriding the ScrollView style. The popup's maximum
height is also specified by the menu style.
The gallery example can finally use a font families combo box.
Task-number: QTBUG-31568
Change-Id: I34a7278f476471c0eb51ef51dde3dd83e13002fe
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|
|
|
|
|
|
|
| |
We seem to receive a size change later that we used to, and this exposed
a bug were the popup would always be aligned on the first item.
Change-Id: I7b7b4ca5fcff969c3b492419cab7447170a2c3f5
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/controls/qquickaction.cpp
Change-Id: I85255ba5c27c0d8ea023d0867e5963d43f8f1ddb
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The Windows QPA plugin doesn't trigger activated window events for popups,
resulting on the popup window not being the application focus window, and
therefore, the popup window's content item not getting focus. This results
in key pressed events not being sent to the menu item.
We workaround this by emitting the window activated event ourselves right
after the popup window is exposed.
Task-number: QTBUG-33175
Change-Id: I77d1eb33b71af2232a6be6d0f7c6b480bffc10d4
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
|
|/
|
|
|
|
| |
Change-Id: I60f997e545076feb5b72fb9eb4a03b050db5f511
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
We translate the menu popup window by its transient parent origin
coordinates, but if it's embedded in a QWidget, we would only translate
by the transient parent's origin inside that QWidget. So, in this case.
we translate by the transient parent's origin in the global coordinate
reference system.
Task-number: QTBUG-31659
Change-Id: I09aa64f2d61d227d4fcd6d6e22a25453e1f2dc76
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|
Change-Id: I89aa205686f0bdf2b267ad17a8ae0470c2f4751f
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
|