1
=== modified file 'qml/ApplicationMenus/MenuPopup.qml'
2
--- qml/ApplicationMenus/MenuPopup.qml	2017-02-07 15:45:42 +0000
3
+++ qml/ApplicationMenus/MenuPopup.qml	2017-02-07 15:45:43 +0000
4
@@ -110,6 +110,8 @@
5
110
            } else {
110
            } else {
6
111
                hoveredItem = null;
111
                hoveredItem = null;
7
112
            }
112
            }
8
113
9
114
            submenuHoverTimer.stop();
10
113
        }
115
        }
11
114
116
12
115
        onSelect: {
117
        onSelect: {
13
@@ -210,6 +212,12 @@
14
210
                contentHeight: menuColumn.height
212
                contentHeight: menuColumn.height
15
211
                interactive: height < contentHeight
213
                interactive: height < contentHeight
16
212
214
17
215
                Timer {
18
216
                    id: submenuHoverTimer
19
217
                    interval: 225 // GTK MENU_POPUP_DELAY, Qt SH_Menu_SubMenuPopupDelay in QCommonStyle is 256
20
218
                    onTriggered: d.currentItem.item.trigger();
21
219
                }
22
220
23
213
                MouseArea {
221
                MouseArea {
24
214
                    anchors.fill: parent
222
                    anchors.fill: parent
25
215
                    hoverEnabled: true
223
                    hoverEnabled: true
26
@@ -223,12 +231,17 @@
27
223
231
28
224
                        if (!d.hoveredItem || !d.currentItem ||
232
                        if (!d.hoveredItem || !d.currentItem ||
29
225
                                !d.hoveredItem.contains(Qt.point(pos.x - d.currentItem.x, pos.y - d.currentItem.y))) {
233
                                !d.hoveredItem.contains(Qt.point(pos.x - d.currentItem.x, pos.y - d.currentItem.y))) {
30
234
                            submenuHoverTimer.stop();
31
235
32
226
                            d.hoveredItem = menuColumn.childAt(pos.x, pos.y)
236
                            d.hoveredItem = menuColumn.childAt(pos.x, pos.y)
33
227
                            if (!d.hoveredItem || !d.hoveredItem.enabled)
237
                            if (!d.hoveredItem || !d.hoveredItem.enabled)
35
228
                                return false;
238
                                return;
36
229
                            d.currentItem = d.hoveredItem;
239
                            d.currentItem = d.hoveredItem;
37
240
38
241
                            if (!d.currentItem.__isSeparator && d.currentItem.item.hasSubmenu && d.currentItem.item.enabled) {
39
242
                                submenuHoverTimer.start();
40
243
                            }
41
230
                        }
244
                        }
42
231
                        return true;
43
232
                    }
245
                    }
44
233
                }
246
                }
45
234
247
46
@@ -283,6 +296,8 @@
47
283
                                    width: MathUtils.clamp(implicitWidth, d.__minimumWidth, d.__maximumWidth)
296
                                    width: MathUtils.clamp(implicitWidth, d.__minimumWidth, d.__maximumWidth)
48
284
297
49
285
                                    action.onTriggered: {
298
                                    action.onTriggered: {
50
299
                                        submenuHoverTimer.stop();
51
300
52
286
                                        d.currentItem = loader;
301
                                        d.currentItem = loader;
53
287
302
54
288
                                        if (hasSubmenu) {
303
                                        if (hasSubmenu) {
55
289
304
56
=== modified file 'tests/qmltests/ApplicationMenus/tst_MenuPopup.qml'
57
--- tests/qmltests/ApplicationMenus/tst_MenuPopup.qml	2017-01-18 12:08:14 +0000
58
+++ tests/qmltests/ApplicationMenus/tst_MenuPopup.qml	2017-02-07 15:45:43 +0000
59
@@ -223,6 +223,20 @@
60
223
            tryCompareFunction(function() { return menuItem.popup !== null && menuItem.popup.visible }, false);
223
            tryCompareFunction(function() { return menuItem.popup !== null && menuItem.popup.visible }, false);
61
224
        }
224
        }
62
225
225
63
226
        function test_mouseHoverOpensSubMenu() {
64
227
            menu.unityMenuModel.modelData = appMenuData.generateTestData(3,3,1,0,"menu",false);
65
228
66
229
            var menuItem = findChild(menu, "menu-item0");
67
230
68
231
            var priv = findInvisibleChild(menu, "d");
69
232
            priv.currentItem = menuItem;
70
233
71
234
            mouseMove(menuItem, menuItem.width/2, menuItem.height/2);
72
235
            verify(!menuItem.popup);
73
236
74
237
            tryCompareFunction(function() { return menuItem.popup != null; }, true);
75
238
        }
76
239
77
226
        function test_differentSizes() {
240
        function test_differentSizes() {
78
227
            var differentSizesMenu = [{
241
            var differentSizesMenu = [{
79
228
                "rowData": { "label": "Short" }}, {
242
                "rowData": { "label": "Short" }}, {
Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)		2017-01-25	Approve on 2017-01-27
Unity8 CI Bot	continuous-integration		Approve on 2017-01-26
Review via email: mp+315567@code.launchpad.net