git.iko.soy/unity8
on xenial help sign in
more test fixes
a46efdeNick Dedekind
qml/ApplicationMenus/MenuBar.qml+46−42
compare with xenial
unifiedsplit
@@ -39,33 +39,18 @@ Item {
39 d.dismissAll();
39 d.dismissAll();
40 }
40 }
41
41
42− // Need 2 shortcuts because Alt press gives a different event to Alt release.
43 GlobalShortcut {
42 GlobalShortcut {
44 shortcut: Qt.Key_Alt|Qt.AltModifier
43 shortcut: Qt.Key_Alt|Qt.AltModifier
45 active: enableKeyFilter
44 active: enableKeyFilter
46− onTriggered: {
45+ onTriggered: d.startShortcutTimer()
47− d.altPressed = true;
46+ onReleased: d.stopSHortcutTimer()
48− d.longAltPressed = false;
49− menuBarShortcutTimer.start();
50− }
51 }
47 }
48+ // On an actual keyboard, the AltModifier is not supplied on release.
52 GlobalShortcut {
49 GlobalShortcut {
53 shortcut: Qt.Key_Alt
50 shortcut: Qt.Key_Alt
54 active: enableKeyFilter
51 active: enableKeyFilter
55− onReleased: {
56− menuBarShortcutTimer.stop();
57− d.altPressed = false;
58− d.longAltPressed = false;
59− }
60− }
61−
62− Timer {
63− id: menuBarShortcutTimer
64− interval: 200
65− repeat: false
66− onTriggered: {
52+ onTriggered: d.startShortcutTimer()
67− d.longAltPressed = true;
53+ onReleased: d.stopSHortcutTimer()
68− }
69 }
54 }
70
55
71 InverseMouseArea {
56 InverseMouseArea {
@@ -187,6 +172,32 @@ Item {
187 } // Repeater
172 } // Repeater
188 } // Row
173 } // Row
189
174
175+ MouseArea {
176+ anchors.fill: parent
177+ hoverEnabled: d.currentItem
178+
179+ onPositionChanged: {
180+ if (d.currentItem) {
181+ updateCurrentItemFromPosition(mouse)
182+ }
183+ }
184+ onClicked: updateCurrentItemFromPosition(mouse)
185+
186+ function updateCurrentItemFromPosition(point) {
187+ var pos = mapToItem(row, point.x, point.y);
188+
189+ if (!d.hoveredItem || !d.currentItem || !d.hoveredItem.contains(Qt.point(pos.x - d.currentItem.x, pos.y - d.currentItem.y))) {
190+ d.hoveredItem = row.childAt(pos.x, pos.y);
191+ if (!d.hoveredItem || !d.hoveredItem.enabled)
192+ return false;
193+ if (d.currentItem != d.hoveredItem) {
194+ d.currentItem = d.hoveredItem;
195+ }
196+ }
197+ return true;
198+ }
199+ }
200+
190 Rectangle {
201 Rectangle {
191 id: underline
202 id: underline
192 anchors {
203 anchors {
@@ -224,32 +235,25 @@ Item {
224 if (currentItem) currentItem.show();
235 if (currentItem) currentItem.show();
225 prevCurrentItem = currentItem;
236 prevCurrentItem = currentItem;
226 }
237 }
227− }
228−
229− MouseArea {
230− id: menuMouseArea
231− anchors.fill: parent
232− hoverEnabled: d.currentItem
233
238
234− onPositionChanged: {
239+ function startShortcutTimer() {
235− if (d.currentItem) {
240+ d.altPressed = true;
236− updateCurrentItemFromPosition(mouse)
241+ menuBarShortcutTimer.start();
237− }
238 }
242 }
239− onClicked: updateCurrentItemFromPosition(mouse)
240
243
241− function updateCurrentItemFromPosition(point) {
244+ function stopSHortcutTimer() {
242− var pos = mapToItem(row, point.x, point.y);
245+ menuBarShortcutTimer.stop();
246+ d.altPressed = false;
247+ d.longAltPressed = false;
248+ }
249+ }
243
250
244− if (!d.hoveredItem || !d.currentItem || !d.hoveredItem.contains(Qt.point(pos.x - d.currentItem.x, pos.y - d.currentItem.y))) {
251+ Timer {
245− d.hoveredItem = row.childAt(pos.x, pos.y);
252+ id: menuBarShortcutTimer
246− if (!d.hoveredItem || !d.hoveredItem.enabled)
253+ interval: 200
247− return false;
254+ repeat: false
248− if (d.currentItem != d.hoveredItem) {
255+ onTriggered: {
249− d.currentItem = d.hoveredItem;
256+ d.longAltPressed = true;
250− }
251− }
252− return true;
253 }
257 }
254 }
258 }
255
259
qml/Stage/WindowDecoration.qml+7−10
@@ -135,16 +135,13 @@ MouseArea {
135 anchors.bottom: parent.bottom
135 anchors.bottom: parent.bottom
136 height: parent.height
136 height: parent.height
137 width: parent.width
137 width: parent.width
138− sourceComponent: root.menu ? menuBarComponent : undefined
138+ active: root.menu !== undefined
139−
139+
140− Component {
141− id: menuBarComponent
142− MenuBar {
140+ sourceComponent: MenuBar {
143− id: menuBar
141+ id: menuBar
144− height: menuBarLoader.height
142+ height: menuBarLoader.height
145− enableKeyFilter: root.active && valid
143+ enableKeyFilter: root.active && valid
146− unityMenuModel: root.menu
144+ unityMenuModel: root.menu
147− }
148 }
145 }
149
146
150 opacity: !overlayShown && priv.shouldShowMenus ? 1 : 0
147 opacity: !overlayShown && priv.shouldShowMenus ? 1 : 0
tests/qmltests/Stage/tst_DesktopStage.qml+1−2
@@ -741,8 +741,7 @@ Item {
741
741
742 var posBefore = Qt.point(appDelegate.x, appDelegate.y);
742 var posBefore = Qt.point(appDelegate.x, appDelegate.y);
743
743
744− mousePress(appDelegate, appDelegate.width / 2, units.gu(1), data.button);
744+ mouseDrag(appDelegate, appDelegate.width / 2, units.gu(1), 0, appDelegate.height / 2, data.button, Qt.NoModifier, 200)
745− mouseMove(appDelegate, appDelegate.width / 2, -units.gu(100), undefined /* delay */, data.button);
746
745
747 var posAfter = Qt.point(appDelegate.x, appDelegate.y);
746 var posAfter = Qt.point(appDelegate.x, appDelegate.y);
748
747