diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-09-04 17:35:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-04 18:11:06 +0200 |
| commit | 9548940ced977afe6949121ae106154320f6a0b1 (patch) | |
| tree | 59a4e74a40f545e3470e4f1a657e6cf912aadfba /src/controls/Menu.qml | |
| parent | 53fa52bb604ab28ee37aba26e155486e94c66dec (diff) | |
| download | qtquickcontrols-9548940ced977afe6949121ae106154320f6a0b1.tar.gz | |
Menu: Fix popup closing when moving mouse to submenu
Task-number: QTBUG-32673
Change-Id: I1a083f6d7b231b1e3d60012306faf5ad4c573f5e
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/controls/Menu.qml')
| -rw-r--r-- | src/controls/Menu.qml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml index e89099db..6c9f8fd2 100644 --- a/src/controls/Menu.qml +++ b/src/controls/Menu.qml @@ -258,7 +258,15 @@ MenuPrivate { if (!currentItem || !currentItem.contains(Qt.point(pos.x - currentItem.x, pos.y - currentItem.y))) { if (currentItem && !pressed && currentItem.isSubmenu) currentItem.closeSubMenu() - currentItem = column.childAt(pos.x, pos.y) + var itemUnderMouse = column.childAt(pos.x, pos.y) + if (itemUnderMouse) { + currentItem = itemUnderMouse + } else { + var itemItem = currentItem.item + if (!itemItem.contains(itemItem.mapFromItem(column, pos))) + currentItem = null + } + if (currentItem) { root.__currentIndex = currentItem.menuItemIndex if (currentItem.isSubmenu && !currentItem.menuItem.__popupVisible) |