git.iko.soy/unity8
on xenial help sign in
Fixed mouse navigation tests
b4f16f5Nick Dedekind
qml/ApplicationMenus/MenuBar.qml+7−2
compare with xenial
unifiedsplit
@@ -188,12 +188,17 @@ Item {
188 anchors.fill: parent
188 anchors.fill: parent
189 hoverEnabled: d.currentItem
189 hoverEnabled: d.currentItem
190
190
191+ onEntered: {
192+ if (d.currentItem) {
193+ updateCurrentItemFromPosition(Qt.point(mouseX, mouseY))
194+ }
195+ }
191 onPositionChanged: {
196 onPositionChanged: {
192 if (d.currentItem) {
197 if (d.currentItem) {
193− updateCurrentItemFromPosition(mouse)
198+ updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
194 }
199 }
195 }
200 }
196− onClicked: updateCurrentItemFromPosition(mouse)
201+ onClicked: updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
197
202
198 function updateCurrentItemFromPosition(point) {
203 function updateCurrentItemFromPosition(point) {
199 var pos = mapToItem(row, point.x, point.y);
204 var pos = mapToItem(row, point.x, point.y);
qml/ApplicationMenus/MenuPopup.qml+5−4
@@ -183,11 +183,12 @@ UbuntuShape {
183
183
184 MouseArea {
184 MouseArea {
185 id: menuMouseArea
185 id: menuMouseArea
186− anchors.fill: parent
186+ anchors.fill: listView
187 hoverEnabled: true
187 hoverEnabled: true
188− z: -1
188+ propagateComposedEvents: true // propogate events so we send clicks to children.
189−
189+ z: 1 // on top so we override any other hovers
190+ onEntered: updateCurrentItemFromPosition(Qt.point(mouseX, mouseY))
190− onPositionChanged: updateCurrentItemFromPosition(mouse)
191+ onPositionChanged: updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
191
192
192 function updateCurrentItemFromPosition(point) {
193 function updateCurrentItemFromPosition(point) {
193 var pos = mapToItem(listView.contentItem, point.x, point.y);
194 var pos = mapToItem(listView.contentItem, point.x, point.y);
tests/qmltests/ApplicationMenus/tst_MenuBar.qml+26−2
@@ -81,14 +81,38 @@ Item {
81 name: "MenuBar"
81 name: "MenuBar"
82 when: windowShown
82 when: windowShown
83
83
84− property bool clickNavigate: true
85−
86 function init() {
84 function init() {
87 menuBar.dismiss();
85 menuBar.dismiss();
88 menuBackend.modelData = appMenuData.generateTestData(5,5,2,3,"menu")
86 menuBackend.modelData = appMenuData.generateTestData(5,5,2,3,"menu")
89 activatedSpy.clear();
87 activatedSpy.clear();
90 }
88 }
91
89
90+ function test_mouseNavigation() {
91+ menuBackend.modelData = appMenuData.generateTestData(3,3,0,0,"menu");
92+ wait(50) // wait for row to build
93+ var priv = findInvisibleChild(menuBar, "d");
94+
95+ var menuItem0 = findChild(menuBar, "menuBar-item0"); verify(menuItem0);
96+ var menuItem1 = findChild(menuBar, "menuBar-item1"); verify(menuItem1);
97+ var menuItem2 = findChild(menuBar, "menuBar-item2"); verify(menuItem2);
98+
99+ menuItem0.show();
100+ compare(priv.currentItem, menuItem0, "CurrentItem should be set to item 0");
101+ compare(priv.currentItem.popupVisible, true, "Popup should be visible");
102+
103+ mouseMove(menuItem1, menuItem1.width/2, menuItem1.height/2);
104+ tryCompare(priv, "currentItem", menuItem1, undefined, "CurrentItem should have moved to item 1");
105+ compare(menuItem1.popupVisible, true, "Popup should be visible");
106+
107+ mouseMove(menuItem2, menuItem2.width/2, menuItem2.height/2);
108+ tryCompare(priv, "currentItem", menuItem2, undefined, "CurrentItem should have moved to item 2");
109+ compare(menuItem2.popupVisible, true, "Popup should be visible");
110+
111+ mouseMove(menuItem0, menuItem0.width/2, menuItem0.height/2);
112+ tryCompare(priv, "currentItem", menuItem0, undefined, "CurrentItem should have moved to item 0");
113+ compare(menuItem0.popupVisible, true, "Popup should be visible");
114+ }
115+
92 function test_keyboardNavigation_RightKeySelectsNextMenuItem(data) {
116 function test_keyboardNavigation_RightKeySelectsNextMenuItem(data) {
93 menuBackend.modelData = appMenuData.generateTestData(3,3,0,0,"menu");
117 menuBackend.modelData = appMenuData.generateTestData(3,3,0,0,"menu");
94 var priv = findInvisibleChild(menuBar, "d");
118 var priv = findInvisibleChild(menuBar, "d");
tests/qmltests/ApplicationMenus/tst_MenuPopup.qml+3−3
@@ -63,7 +63,7 @@ Item {
63
63
64 UnityTestCase {
64 UnityTestCase {
65 id: testCase
65 id: testCase
66− name: "MenuPage"
66+ name: "MenuPopup"
67 when: windowShown
67 when: windowShown
68
68
69 function init() {
69 function init() {
@@ -105,14 +105,14 @@ Item {
105 }
105 }
106 }
106 }
107
107
108− function test_clickNavigation_data() {
108+ function test_mouseNavigation_data() {
109 return [
109 return [
110 { tag: "long", testData: appMenuData.generateTestData(4, 2, 1, 0, "menu", false) },
110 { tag: "long", testData: appMenuData.generateTestData(4, 2, 1, 0, "menu", false) },
111 { tag: "deep", testData: appMenuData.generateTestData(2, 4, 1, 0, "menu", false) }
111 { tag: "deep", testData: appMenuData.generateTestData(2, 4, 1, 0, "menu", false) }
112 ]
112 ]
113 }
113 }
114
114
115− function test_clickNavigation(data) {
115+ function test_mouseNavigation(data) {
116 menuBackend.modelData = data.testData;
116 menuBackend.modelData = data.testData;
117
117
118 recurseMenuConstruction(data.testData, page);
118 recurseMenuConstruction(data.testData, page);