1
=== modified file 'qml/ApplicationMenus/MenuBar.qml'
2
--- qml/ApplicationMenus/MenuBar.qml	2017-02-07 15:44:24 +0000
3
+++ qml/ApplicationMenus/MenuBar.qml	2017-02-07 15:44:24 +0000
4
@@ -213,7 +213,13 @@
5
213
                    updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
213
                    updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
6
214
                }
214
                }
7
215
            }
215
            }
9
216
            onClicked: updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
216
            onClicked: {
10
217
                var prevItem = d.currentItem;
11
218
                updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
12
219
                if (prevItem && d.currentItem == prevItem) {
13
220
                    prevItem.hide();
14
221
                }
15
222
            }
16
217
223
17
218
            function updateCurrentItemFromPosition(point) {
224
            function updateCurrentItemFromPosition(point) {
18
219
                var pos = mapToItem(row, point.x, point.y);
225
                var pos = mapToItem(row, point.x, point.y);
19
220
226
20
=== modified file 'tests/qmltests/ApplicationMenus/tst_MenuBar.qml'
21
--- tests/qmltests/ApplicationMenus/tst_MenuBar.qml	2017-02-07 15:44:24 +0000
22
+++ tests/qmltests/ApplicationMenus/tst_MenuBar.qml	2017-02-07 15:44:24 +0000
23
@@ -227,5 +227,20 @@
24
227
            keyClick(Qt.Key_F10, Qt.AltModifier);
227
            keyClick(Qt.Key_F10, Qt.AltModifier);
25
228
            compare(priv.currentItem, menuItem1, "First enabled item should be opened");
228
            compare(priv.currentItem, menuItem1, "First enabled item should be opened");
26
229
        }
229
        }
27
230
28
231
        function test_clickOpenMenuClosesMenu() {
29
232
            menuBackend.modelData = appMenuData.generateTestData(3,3,0,0,"menu");
30
233
            var priv = findInvisibleChild(menuBar, "d");
31
234
32
235
            var menuItem = findChild(menuBar, "menuBar-item0");
33
236
            waitForRendering(menuItem);
34
237
            mouseClick(menuItem);
35
238
            compare(priv.currentItem, menuItem, "CurrentItem should be set to item 0");
36
239
            compare(priv.currentItem.popupVisible, true, "Popup should be visible");
37
240
38
241
            waitForRendering(menuItem);
39
242
            mouseClick(menuItem);
40
243
            compare(priv.currentItem, null, "CurrentItem should be null");
41
244
        }
42
230
    }
245
    }
43
231
}
246
}
Status:	Merged
Approved by:	Michael Zanetti on 2017-01-27
Approved revision:	2774
Merged at revision:	2810
Proposed branch:	lp:~aacid/unity8/clickOpenMenuClosesIt
Merge into:	lp:unity8
Prerequisite:	lp:~aacid/unity8/closeMenusOnClick
Diff against target:	43 lines (+22/-1) 2 files modified qml/ApplicationMenus/MenuBar.qml (+7/-1) tests/qmltests/ApplicationMenus/tst_MenuBar.qml (+15/-0)
To merge this branch:	bzr merge lp:~aacid/unity8/clickOpenMenuClosesIt
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)			Approve on 2017-01-27
Unity8 CI Bot	continuous-integration	2017-01-26	Approve on 2017-01-26
Daniel d'Andrada		2017-01-26	Pending
Review via email: mp+315650@code.launchpad.net
1	=== modified file 'qml/ApplicationMenus/MenuBar.qml'
2	--- qml/ApplicationMenus/MenuBar.qml 2017-02-07 15:44:24 +0000
3	+++ qml/ApplicationMenus/MenuBar.qml 2017-02-07 15:44:24 +0000
4	@@ -213,7 +213,13 @@
5	213	updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))	213	updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
6	214	}	214	}
7	215	}	215	}
9	216	onClicked: updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))	216	onClicked: {
10			217	var prevItem = d.currentItem;
11			218	updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
12			219	if (prevItem && d.currentItem == prevItem) {
13			220	prevItem.hide();
14			221	}
15			222	}
16	217		223
17	218	function updateCurrentItemFromPosition(point) {	224	function updateCurrentItemFromPosition(point) {
18	219	var pos = mapToItem(row, point.x, point.y);	225	var pos = mapToItem(row, point.x, point.y);
19	220		226
20	=== modified file 'tests/qmltests/ApplicationMenus/tst_MenuBar.qml'
21	--- tests/qmltests/ApplicationMenus/tst_MenuBar.qml 2017-02-07 15:44:24 +0000
22	+++ tests/qmltests/ApplicationMenus/tst_MenuBar.qml 2017-02-07 15:44:24 +0000
23	@@ -227,5 +227,20 @@
24	227	keyClick(Qt.Key_F10, Qt.AltModifier);	227	keyClick(Qt.Key_F10, Qt.AltModifier);
25	228	compare(priv.currentItem, menuItem1, "First enabled item should be opened");	228	compare(priv.currentItem, menuItem1, "First enabled item should be opened");
26	229	}	229	}
27			230
28			231	function test_clickOpenMenuClosesMenu() {
29			232	menuBackend.modelData = appMenuData.generateTestData(3,3,0,0,"menu");
30			233	var priv = findInvisibleChild(menuBar, "d");
31			234
32			235	var menuItem = findChild(menuBar, "menuBar-item0");
33			236	waitForRendering(menuItem);
34			237	mouseClick(menuItem);
35			238	compare(priv.currentItem, menuItem, "CurrentItem should be set to item 0");
36			239	compare(priv.currentItem.popupVisible, true, "Popup should be visible");
37			240
38			241	waitForRendering(menuItem);
39			242	mouseClick(menuItem);
40			243	compare(priv.currentItem, null, "CurrentItem should be null");
41			244	}
42	230	}	245	}
43	231	}	246	}