diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:28:09 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:28:09 +0200 |
| commit | cb6ccf9fee26c5a2b7f3946b7ffc05430b7be3ff (patch) | |
| tree | 6de74ca46c389328696831bcc74cd5aff6756fee /src/controls/Menu.qml | |
| parent | ded73ee2ae8aa333894ab11ce2297e755ec03f3e (diff) | |
| parent | de9145dcd904068256e28e130fdfda2e8014efe8 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
src/controls/qquickmenupopupwindow_p.h
Change-Id: Ic935bb56f5df70645eea30c890759f5980d68fe4
Diffstat (limited to 'src/controls/Menu.qml')
| -rw-r--r-- | src/controls/Menu.qml | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml index 0cee85a6a..b85008eb4 100644 --- a/src/controls/Menu.qml +++ b/src/controls/Menu.qml @@ -151,13 +151,24 @@ MenuPrivate { property int __currentIndex: -1 /*! \internal */ on__MenuClosed: __currentIndex = -1 + on__MenuPopupDestroyed: contentLoader.active = false + onPopupVisibleChanged: { + if (__popupVisible) + contentLoader.active = true + } /*! \internal */ __contentItem: Loader { - sourceComponent: MenuContentItem { - __menu: root + id: contentLoader + Component { + id: menuContent + MenuContentItem { + __menu: root + } } - active: !root.__isNative && root.__popupVisible + + sourceComponent: root.__isNative ? null : menuContent + active: false focus: true Keys.forwardTo: item ? [item, root.__parentContentItem] : [] property bool altPressed: root.__parentContentItem ? root.__parentContentItem.altPressed : false |