on xenial help sign in
Auto open submenus on hover (LP: #1657085)

Approved by: Michael Zanetti, Unity8 CI Bot

commit903afa9d4cbbdf636b3822a9d52bd411cc3de3a9 authorAlbert Astals Cid <albert.astals@canonical.com> dateThu 16 Feb 2017, 13:42 (10 years ago) parent0edaf2ce8f890d
2 files changed+31−2
qml/ApplicationMenus/MenuPopup.qml+17−2 tests/qmltests/ApplicationMenus/tst_MenuPopup.qml+14
qml/ApplicationMenus/MenuPopup.qml+17−2
@@ -110,6 +110,8 @@ UbuntuShape {
110110 } else {
111111 hoveredItem = null;
112112 }
113+
114+ submenuHoverTimer.stop();
113115 }
114116
115117 onSelect: {
@@ -210,6 +212,12 @@ UbuntuShape {
210212 contentHeight: menuColumn.height
211213 interactive: height < contentHeight
212214
215+ Timer {
216+ id: submenuHoverTimer
217+ interval: 225 // GTK MENU_POPUP_DELAY, Qt SH_Menu_SubMenuPopupDelay in QCommonStyle is 256
218+ onTriggered: d.currentItem.item.trigger();
219+ }
220+
213221 MouseArea {
214222 anchors.fill: parent
215223 hoverEnabled: true
@@ -223,12 +231,17 @@ UbuntuShape {
223231
224232 if (!d.hoveredItem || !d.currentItem ||
225233 !d.hoveredItem.contains(Qt.point(pos.x - d.currentItem.x, pos.y - d.currentItem.y))) {
234+ submenuHoverTimer.stop();
235+
226236 d.hoveredItem = menuColumn.childAt(pos.x, pos.y)
227237 if (!d.hoveredItem || !d.hoveredItem.enabled)
228− return false;
238+ return;
229239 d.currentItem = d.hoveredItem;
240+
241+ if (!d.currentItem.__isSeparator && d.currentItem.item.hasSubmenu && d.currentItem.item.enabled) {
242+ submenuHoverTimer.start();
243+ }
230244 }
231− return true;
232245 }
233246 }
234247
@@ -283,6 +296,8 @@ UbuntuShape {
283296 width: MathUtils.clamp(implicitWidth, d.__minimumWidth, d.__maximumWidth)
284297
285298 action.onTriggered: {
299+ submenuHoverTimer.stop();
300+
286301 d.currentItem = loader;
287302
288303 if (hasSubmenu) {
tests/qmltests/ApplicationMenus/tst_MenuPopup.qml+14
@@ -223,6 +223,20 @@ Item {
223223 tryCompareFunction(function() { return menuItem.popup !== null && menuItem.popup.visible }, false);
224224 }
225225
226+ function test_mouseHoverOpensSubMenu() {
227+ menu.unityMenuModel.modelData = appMenuData.generateTestData(3,3,1,0,"menu",false);
228+
229+ var menuItem = findChild(menu, "menu-item0");
230+
231+ var priv = findInvisibleChild(menu, "d");
232+ priv.currentItem = menuItem;
233+
234+ mouseMove(menuItem, menuItem.width/2, menuItem.height/2);
235+ verify(!menuItem.popup);
236+
237+ tryCompareFunction(function() { return menuItem.popup != null; }, true);
238+ }
239+
226240 function test_differentSizes() {
227241 var differentSizesMenu = [{
228242 "rowData": { "label": "Short" }}, {