1
=== modified file 'qml/ApplicationMenus/MenuBar.qml'
2
--- qml/ApplicationMenus/MenuBar.qml	2017-03-21 10:56:10 +0000
3
+++ qml/ApplicationMenus/MenuBar.qml	2017-03-24 08:30:38 +0000
4
@@ -224,6 +224,13 @@
5
224
                        }
224
                        }
6
225
                    }
225
                    }
7
226
                }
226
                }
8
227
9
228
                Component.onDestruction: {
10
229
                    if (__popup) {
11
230
                        __popup.destroy();
12
231
                        __popup = null;
13
232
                    }
14
233
                }
15
227
            } // Item ( delegate )
234
            } // Item ( delegate )
16
228
        } // Repeater
235
        } // Repeater
17
229
    } // Row
236
    } // Row
18
230
237
19
=== modified file 'qml/ApplicationMenus/MenuPopup.qml'
20
--- qml/ApplicationMenus/MenuPopup.qml	2017-03-21 10:56:10 +0000
21
+++ qml/ApplicationMenus/MenuPopup.qml	2017-03-24 08:30:38 +0000
22
@@ -297,6 +297,8 @@
23
297
297
24
298
                        width: MathUtils.clamp(implicitWidth, d.__minimumWidth, d.__maximumWidth)
298
                        width: MathUtils.clamp(implicitWidth, d.__minimumWidth, d.__maximumWidth)
25
299
299
26
300
                        property Item popup: null
27
301
28
300
                        action.onTriggered: {
302
                        action.onTriggered: {
29
301
                            submenuHoverTimer.stop();
303
                            submenuHoverTimer.stop();
30
302
304
31
@@ -351,6 +353,13 @@
32
351
                                }
353
                                }
33
352
                            }
354
                            }
34
353
                        }
355
                        }
35
356
36
357
                        Component.onDestruction: {
37
358
                            if (popup) {
38
359
                                popup.destroy();
39
360
                                popup = null;
40
361
                            }
41
362
                        }
42
354
                    }
363
                    }
43
355
                }
364
                }
44
356
365
45
@@ -373,7 +382,7 @@
46
373
                            id: loader
382
                            id: loader
47
374
                            objectName: root.objectName + "-item" + __ownIndex
383
                            objectName: root.objectName + "-item" + __ownIndex
48
375
384
50
376
                            property Item popup: null
385
                            readonly property var popup: item ? item.popup : null
51
377
                            property var __menuData: model
386
                            property var __menuData: model
52
378
                            property int __ownIndex: index
387
                            property int __ownIndex: index
53
379
                            property bool __isSeparator: model.isSeparator
388
                            property bool __isSeparator: model.isSeparator
54
380
389
55
=== modified file 'tests/qmltests/ApplicationMenus/tst_MenuBar.qml'
56
--- tests/qmltests/ApplicationMenus/tst_MenuBar.qml	2017-03-21 10:56:10 +0000
57
+++ tests/qmltests/ApplicationMenus/tst_MenuBar.qml	2017-03-24 08:30:38 +0000
58
@@ -339,6 +339,31 @@
59
339
            }, true);
339
            }, true);
60
340
        }
340
        }
61
341
341
62
342
        function test_stray_submenus() {
63
343
            menuBackend.modelData = appMenuData.generateTestData(3,4,1,0,"menu");
64
344
            var priv = findInvisibleChild(menuBar, "d");
65
345
66
346
            var menuItem = findChild(menuBar, "menuBar-item0");
67
347
            menuItem.show();
68
348
            compare(priv.currentItem, menuItem, "CurrentItem should be set to item 0");
69
349
            compare(priv.currentItem.popupVisible, true, "Popup should be visible");
70
350
71
351
            var actionItem = findChild(menuBar, "menuBar-item0-menu-item0-actionItem");
72
352
            mouseClick(actionItem);
73
353
74
354
            actionItem = findChild(menuBar, "menuBar-item0-menu-item0-menu-item0-actionItem");
75
355
            mouseClick(actionItem);
76
356
77
357
            actionItem = findChild(menuBar, "menuBar-item0-menu-item0-menu-item0-menu-item0-actionItem");
78
358
79
359
            // There's one popup
80
360
            tryCompareFunction(function() { return findChildsByType(root, "MenuPopup").length; }, 3);
81
361
82
362
            menuBackend.modelData = null;
83
363
84
364
            tryCompareFunction(function() { return findChildsByType(root, "MenuPopup").length; }, 0);
85
365
        }
86
366
87
342
        function test_firstDisabled() {
367
        function test_firstDisabled() {
88
343
            var data = appMenuData.generateTestData(10,5,2,3);
368
            var data = appMenuData.generateTestData(10,5,2,3);
89
344
            data[0].submenu[1].submenu[0].rowData.sensitive = false;
369
            data[0].submenu[1].submenu[0].rowData.sensitive = false;
Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2017-03-14	Approve on 2017-03-24
Unity8 CI Bot	continuous-integration		Approve on 2017-03-24
Review via email: mp+319785@code.launchpad.net
1	=== modified file 'qml/ApplicationMenus/MenuBar.qml'
2	--- qml/ApplicationMenus/MenuBar.qml 2017-03-21 10:56:10 +0000
3	+++ qml/ApplicationMenus/MenuBar.qml 2017-03-24 08:30:38 +0000
4	@@ -224,6 +224,13 @@
5	224	}	224	}
6	225	}	225	}
7	226	}	226	}
8			227
9			228	Component.onDestruction: {
10			229	if (__popup) {
11			230	__popup.destroy();
12			231	__popup = null;
13			232	}
14			233	}
15	227	} // Item ( delegate )	234	} // Item ( delegate )
16	228	} // Repeater	235	} // Repeater
17	229	} // Row	236	} // Row
18	230		237
19	=== modified file 'qml/ApplicationMenus/MenuPopup.qml'
20	--- qml/ApplicationMenus/MenuPopup.qml 2017-03-21 10:56:10 +0000
21	+++ qml/ApplicationMenus/MenuPopup.qml 2017-03-24 08:30:38 +0000
22	@@ -297,6 +297,8 @@
23	297		297
24	298	width: MathUtils.clamp(implicitWidth, d.__minimumWidth, d.__maximumWidth)	298	width: MathUtils.clamp(implicitWidth, d.__minimumWidth, d.__maximumWidth)
25	299		299
26			300	property Item popup: null
27			301
28	300	action.onTriggered: {	302	action.onTriggered: {
29	301	submenuHoverTimer.stop();	303	submenuHoverTimer.stop();
30	302		304
31	@@ -351,6 +353,13 @@
32	351	}	353	}
33	352	}	354	}
34	353	}	355	}
35			356
36			357	Component.onDestruction: {
37			358	if (popup) {
38			359	popup.destroy();
39			360	popup = null;
40			361	}
41			362	}
42	354	}	363	}
43	355	}	364	}
44	356		365
45	@@ -373,7 +382,7 @@
46	373	id: loader	382	id: loader
47	374	objectName: root.objectName + "-item" + __ownIndex	383	objectName: root.objectName + "-item" + __ownIndex
48	375		384
50	376	property Item popup: null	385	readonly property var popup: item ? item.popup : null
51	377	property var __menuData: model	386	property var __menuData: model
52	378	property int __ownIndex: index	387	property int __ownIndex: index
53	379	property bool __isSeparator: model.isSeparator	388	property bool __isSeparator: model.isSeparator
54	380		389
55	=== modified file 'tests/qmltests/ApplicationMenus/tst_MenuBar.qml'
56	--- tests/qmltests/ApplicationMenus/tst_MenuBar.qml 2017-03-21 10:56:10 +0000
57	+++ tests/qmltests/ApplicationMenus/tst_MenuBar.qml 2017-03-24 08:30:38 +0000
58	@@ -339,6 +339,31 @@
59	339	}, true);	339	}, true);
60	340	}	340	}
61	341		341
62			342	function test_stray_submenus() {
63			343	menuBackend.modelData = appMenuData.generateTestData(3,4,1,0,"menu");
64			344	var priv = findInvisibleChild(menuBar, "d");
65			345
66			346	var menuItem = findChild(menuBar, "menuBar-item0");
67			347	menuItem.show();
68			348	compare(priv.currentItem, menuItem, "CurrentItem should be set to item 0");
69			349	compare(priv.currentItem.popupVisible, true, "Popup should be visible");
70			350
71			351	var actionItem = findChild(menuBar, "menuBar-item0-menu-item0-actionItem");
72			352	mouseClick(actionItem);
73			353
74			354	actionItem = findChild(menuBar, "menuBar-item0-menu-item0-menu-item0-actionItem");
75			355	mouseClick(actionItem);
76			356
77			357	actionItem = findChild(menuBar, "menuBar-item0-menu-item0-menu-item0-menu-item0-actionItem");
78			358
79			359	// There's one popup
80			360	tryCompareFunction(function() { return findChildsByType(root, "MenuPopup").length; }, 3);
81			361
82			362	menuBackend.modelData = null;
83			363
84			364	tryCompareFunction(function() { return findChildsByType(root, "MenuPopup").length; }, 0);
85			365	}
86			366
87	342	function test_firstDisabled() {	367	function test_firstDisabled() {
88	343	var data = appMenuData.generateTestData(10,5,2,3);	368	var data = appMenuData.generateTestData(10,5,2,3);
89	344	data[0].submenu[1].submenu[0].rowData.sensitive = false;	369	data[0].submenu[1].submenu[0].rowData.sensitive = false;