git.iko.soy/unity8
on xenial help sign in
refinements
3dc50afAlbert 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: {
@@ -236,7 +238,7 @@ UbuntuShape {
236 return;
238 return;
237 d.currentItem = d.hoveredItem;
239 d.currentItem = d.hoveredItem;
238
240
239− if (!d.currentItem.__isSeparator && d.currentItem.item.hasSubmenu) {
241+ if (!d.currentItem.__isSeparator && d.currentItem.item.hasSubmenu && d.currentItem.item.enabled) {
240 submenuHoverTimer.start();
242 submenuHoverTimer.start();
241 }
243 }
242 }
244 }
@@ -294,6 +296,8 @@ UbuntuShape {
294 width: MathUtils.clamp(implicitWidth, d.__minimumWidth, d.__maximumWidth)
296 width: MathUtils.clamp(implicitWidth, d.__minimumWidth, d.__maximumWidth)
295
297
296 action.onTriggered: {
298 action.onTriggered: {
299+ submenuHoverTimer.stop();
300+
297 d.currentItem = loader;
301 d.currentItem = loader;
298
302
299 if (hasSubmenu) {
303 if (hasSubmenu) {