git.iko.soy/unity8
on xenial help sign in
Merge
502020dAlbert Astals Cid
qml/ApplicationMenus/MenuPopup.qml+5−1
compare with xenial
unifiedsplit
@@ -110,6 +110,8 @@ UbuntuShape {
110 } else {
110 } else {
111 hoveredItem = null;
111 hoveredItem = null;
112 }
112 }
113+
114+ submenuHoverTimer.stop();
113 }
115 }
114
116
115 onSelect: {
117 onSelect: {
@@ -235,7 +237,7 @@ UbuntuShape {
235 return;
237 return;
236 d.currentItem = d.hoveredItem;
238 d.currentItem = d.hoveredItem;
237
239
238− if (!d.currentItem.__isSeparator && d.currentItem.item.hasSubmenu) {
240+ if (!d.currentItem.__isSeparator && d.currentItem.item.hasSubmenu && d.currentItem.item.enabled) {
239 submenuHoverTimer.start();
241 submenuHoverTimer.start();
240 }
242 }
241 }
243 }
@@ -301,6 +303,8 @@ UbuntuShape {
301 width: MathUtils.clamp(implicitWidth, d.__minimumWidth, d.__maximumWidth)
303 width: MathUtils.clamp(implicitWidth, d.__minimumWidth, d.__maximumWidth)
302
304
303 action.onTriggered: {
305 action.onTriggered: {
306+ submenuHoverTimer.stop();
307+
304 d.currentItem = loader;
308 d.currentItem = loader;
305
309
306 if (hasSubmenu) {
310 if (hasSubmenu) {