1
=== modified file 'qml/ApplicationMenus/MenuBar.qml'
2
--- qml/ApplicationMenus/MenuBar.qml	2017-03-03 10:22:19 +0000
3
+++ qml/ApplicationMenus/MenuBar.qml	2017-03-03 10:22:19 +0000
4
@@ -28,11 +28,19 @@
5
28
    property alias unityMenuModel: rowRepeater.model
28
    property alias unityMenuModel: rowRepeater.model
6
29
    property bool enableKeyFilter: false
29
    property bool enableKeyFilter: false
7
30
    property real overflowWidth: width
30
    property real overflowWidth: width
8
31
    property bool windowMoving: false
9
31
32
10
32
    // read from outside
33
    // read from outside
11
33
    readonly property bool valid: rowRepeater.count > 0
34
    readonly property bool valid: rowRepeater.count > 0
12
34
    readonly property bool showRequested: d.longAltPressed || d.currentItem != null
35
    readonly property bool showRequested: d.longAltPressed || d.currentItem != null
13
35
36
14
37
    // MoveHandler API for DecoratedWindow
15
38
    signal pressed(var mouse)
16
39
    signal pressedChangedEx(bool pressed, var pressedButtons, real mouseX, real mouseY)
17
40
    signal positionChanged(var mouse)
18
41
    signal released(var mouse)
19
42
    signal doubleClicked(var mouse)
20
43
21
36
    implicitWidth: row.width
44
    implicitWidth: row.width
22
37
    height: parent.height
45
    height: parent.height
23
38
46
24
@@ -77,7 +85,7 @@
25
77
        anchors.fill: parent
85
        anchors.fill: parent
26
78
        enabled: d.currentItem != null
86
        enabled: d.currentItem != null
27
79
        hoverEnabled: enabled && d.currentItem && d.currentItem.__popup != null
87
        hoverEnabled: enabled && d.currentItem && d.currentItem.__popup != null
29
80
        onPressed: d.dismissAll()
88
        onPressed: { mouse.accepted = false; d.dismissAll(); }
30
81
    }
89
    }
31
82
90
32
83
    Row {
91
    Row {
33
@@ -218,26 +226,42 @@
34
218
    } // Row
226
    } // Row
35
219
227
36
220
    MouseArea {
228
    MouseArea {
38
221
        anchors.fill: row
229
        anchors.fill: parent
39
222
        hoverEnabled: d.currentItem
230
        hoverEnabled: d.currentItem
40
223
231
41
232
        property bool moved: false
42
233
43
224
        onEntered: {
234
        onEntered: {
44
225
            if (d.currentItem) {
235
            if (d.currentItem) {
45
226
                updateCurrentItemFromPosition(Qt.point(mouseX, mouseY))
236
                updateCurrentItemFromPosition(Qt.point(mouseX, mouseY))
46
227
            }
237
            }
47
228
        }
238
        }
49
229
        onPositionChanged: {
239
50
240
        onClicked: {
51
241
            if (!moved) {
52
242
                var prevItem = d.currentItem;
53
243
                updateCurrentItemFromPosition(Qt.point(mouseX, mouseY));
54
244
                if (prevItem && d.currentItem == prevItem) {
55
245
                    prevItem.hide();
56
246
                }
57
247
            }
58
248
            moved = false;
59
249
        }
60
250
61
251
        // for the MoveHandler
62
252
        onPressed: root.pressed(mouse)
63
253
        onPressedChanged: root.pressedChangedEx(pressed, pressedButtons, mouseX, mouseY)
64
254
        onReleased: root.released(mouse)
65
255
        onDoubleClicked: root.doubleClicked(mouse)
66
256
67
257
        Mouse.ignoreSynthesizedEvents: true
68
258
        Mouse.onPositionChanged: {
69
259
            root.positionChanged(mouse);
70
260
            moved = root.windowMoving;
71
230
            if (d.currentItem) {
261
            if (d.currentItem) {
72
231
                updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
262
                updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
73
232
            }
263
            }
74
233
        }
264
        }
75
234
        onClicked: {
76
235
            var prevItem = d.currentItem;
77
236
            updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
78
237
            if (prevItem && d.currentItem == prevItem) {
79
238
                prevItem.hide();
80
239
            }
81
240
        }
82
241
265
83
242
        function updateCurrentItemFromPosition(point) {
266
        function updateCurrentItemFromPosition(point) {
84
243
            var pos = mapToItem(row, point.x, point.y);
267
            var pos = mapToItem(row, point.x, point.y);
85
@@ -260,7 +284,7 @@
86
260
        hoverEnabled: d.currentItem
284
        hoverEnabled: d.currentItem
87
261
        onEntered: d.currentItem = this
285
        onEntered: d.currentItem = this
88
262
        onPositionChanged: d.currentItem = this
286
        onPositionChanged: d.currentItem = this
90
263
        onClicked: d.currentItem = this
287
        onPressed: d.currentItem = this
91
264
288
92
265
        property Item __popup: null;
289
        property Item __popup: null;
93
266
        readonly property bool popupVisible: __popup && __popup.visible
290
        readonly property bool popupVisible: __popup && __popup.visible
94
267
291
95
=== modified file 'qml/Components/WindowControlButtons.qml'
96
--- qml/Components/WindowControlButtons.qml	2017-01-26 11:10:01 +0000
97
+++ qml/Components/WindowControlButtons.qml	2017-03-03 10:22:19 +0000
98
@@ -47,13 +47,6 @@
99
47
        onClicked: root.closeClicked()
47
        onClicked: root.closeClicked()
100
48
        visible: root.closeButtonShown
48
        visible: root.closeButtonShown
101
49
49
102
50
        // We dont want touch events to fall through to parent,
103
51
        // otherwise the containsMouse will not work.
104
52
        MouseArea {
105
53
            anchors.fill: parent
106
54
            propagateComposedEvents: true
107
55
        }
108
56
109
57
        Rectangle {
50
        Rectangle {
110
58
            anchors.fill: parent
51
            anchors.fill: parent
111
59
            anchors.margins: windowIsMaximized ? units.dp(3) : 0
52
            anchors.margins: windowIsMaximized ? units.dp(3) : 0
112
@@ -78,13 +71,6 @@
113
78
        onClicked: root.minimizeClicked()
71
        onClicked: root.minimizeClicked()
114
79
        visible: root.minimizeButtonVisible
72
        visible: root.minimizeButtonVisible
115
80
73
116
81
        // We dont want touch events to fall through to parent,
117
82
        // otherwise the containsMouse will not work.
118
83
        MouseArea {
119
84
            anchors.fill: parent
120
85
            propagateComposedEvents: true
121
86
        }
122
87
123
88
        Rectangle {
74
        Rectangle {
124
89
            anchors.fill: parent
75
            anchors.fill: parent
125
90
            anchors.margins: windowIsMaximized ? units.dp(3) : 0
76
            anchors.margins: windowIsMaximized ? units.dp(3) : 0
126
@@ -118,13 +104,6 @@
127
118
            }
104
            }
128
119
        }
105
        }
129
120
106
130
121
        // We dont want touch events to fall through to parent,
131
122
        // otherwise the containsMouse will not work.
132
123
        MouseArea {
133
124
            anchors.fill: parent
134
125
            propagateComposedEvents: true
135
126
        }
136
127
137
128
        Rectangle {
107
        Rectangle {
138
129
            anchors.fill: parent
108
            anchors.fill: parent
139
130
            anchors.margins: windowIsMaximized ? units.dp(3) : 0
109
            anchors.margins: windowIsMaximized ? units.dp(3) : 0
140
131
110
141
=== modified file 'qml/Panel/Panel.qml'
142
--- qml/Panel/Panel.qml	2017-02-07 14:10:41 +0000
143
+++ qml/Panel/Panel.qml	2017-03-03 10:22:19 +0000
144
@@ -231,6 +231,8 @@
145
231
                            target: __indicators
231
                            target: __indicators
146
232
                            onShownChanged: bar.dismiss();
232
                            onShownChanged: bar.dismiss();
147
233
                        }
233
                        }
148
234
149
235
                        onDoubleClicked: PanelState.restoreClicked()
150
234
                    }
236
                    }
151
235
                }
237
                }
152
236
            }
238
            }
153
237
239
154
=== modified file 'qml/Stage/DecoratedWindow.qml'
155
--- qml/Stage/DecoratedWindow.qml	2017-01-26 11:10:01 +0000
156
+++ qml/Stage/DecoratedWindow.qml	2017-03-03 10:22:19 +0000
157
@@ -204,12 +204,14 @@
158
204
        height: units.gu(3)
204
        height: units.gu(3)
159
205
205
160
206
        title: applicationWindow.title
206
        title: applicationWindow.title
161
207
        windowMoving: moveHandler.moving && !altDragHandler.dragging
162
207
208
163
208
        opacity: root.hasDecoration ? Math.min(1, root.showDecoration) : 0
209
        opacity: root.hasDecoration ? Math.min(1, root.showDecoration) : 0
164
209
        Behavior on opacity { UbuntuNumberAnimation { } }
210
        Behavior on opacity { UbuntuNumberAnimation { } }
165
210
211
166
211
        onPressed: root.decorationPressed();
212
        onPressed: root.decorationPressed();
167
212
        onPressedChanged: moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY)
213
        onPressedChanged: moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY)
168
214
        onPressedChangedEx: moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY)
169
213
        onPositionChanged: moveHandler.handlePositionChanged(mouse)
215
        onPositionChanged: moveHandler.handlePositionChanged(mouse)
170
214
        onReleased: {
216
        onReleased: {
171
215
            root.decorationReleased();
217
            root.decorationReleased();
172
@@ -255,6 +257,7 @@
173
255
    }
257
    }
174
256
258
175
257
    MouseArea {
259
    MouseArea {
176
260
        id: altDragHandler
177
258
        anchors.fill: applicationWindow
261
        anchors.fill: applicationWindow
178
259
        acceptedButtons: Qt.LeftButton
262
        acceptedButtons: Qt.LeftButton
179
260
        property bool dragging: false
263
        property bool dragging: false
180
261
264
181
=== modified file 'qml/Stage/MoveHandler.qml'
182
--- qml/Stage/MoveHandler.qml	2017-01-26 11:10:01 +0000
183
+++ qml/Stage/MoveHandler.qml	2017-03-03 10:22:19 +0000
184
@@ -29,6 +29,7 @@
185
29
    property real boundsTopMargin: 0
29
    property real boundsTopMargin: 0
186
30
30
187
31
    readonly property bool dragging: priv.dragging
31
    readonly property bool dragging: priv.dragging
188
32
    readonly property bool moving: priv.moving
189
32
33
190
33
    signal fakeMaximizeAnimationRequested(real amount)
34
    signal fakeMaximizeAnimationRequested(real amount)
191
34
    signal fakeMaximizeLeftAnimationRequested(real amount)
35
    signal fakeMaximizeLeftAnimationRequested(real amount)
192
@@ -43,6 +44,7 @@
193
43
        property real distanceX
44
        property real distanceX
194
44
        property real distanceY
45
        property real distanceY
195
45
        property bool dragging
46
        property bool dragging
196
47
        property bool moving
197
46
48
198
47
        readonly property int triggerArea: units.gu(8)
49
        readonly property int triggerArea: units.gu(8)
199
48
        property bool nearLeftEdge: target.maximizedLeft
50
        property bool nearLeftEdge: target.maximizedLeft
200
@@ -110,6 +112,7 @@
201
110
112
202
111
    function handlePositionChanged(mouse, sensingPoints) {
113
    function handlePositionChanged(mouse, sensingPoints) {
203
112
        if (priv.dragging) {
114
        if (priv.dragging) {
204
115
            priv.moving = true;
205
113
            priv.mouseDownTimer.stop();
116
            priv.mouseDownTimer.stop();
206
114
            Mir.cursorName = "grabbing";
117
            Mir.cursorName = "grabbing";
207
115
118
208
@@ -180,6 +183,7 @@
209
180
    }
183
    }
210
181
184
211
182
    function handleReleased(touchMode) {
185
    function handleReleased(touchMode) {
212
186
        priv.moving = false;
213
183
        if (touchMode) {
187
        if (touchMode) {
214
184
            priv.progress = 0;
188
            priv.progress = 0;
215
185
            priv.resetEdges();
189
            priv.resetEdges();
216
186
190
217
=== modified file 'qml/Stage/WindowDecoration.qml'
218
--- qml/Stage/WindowDecoration.qml	2017-01-26 11:10:01 +0000
219
+++ qml/Stage/WindowDecoration.qml	2017-03-03 10:22:19 +0000
220
@@ -33,23 +33,21 @@
221
33
    property alias overlayShown: buttons.overlayShown
33
    property alias overlayShown: buttons.overlayShown
222
34
    property var menu: undefined
34
    property var menu: undefined
223
35
    property bool enableMenus: true
35
    property bool enableMenus: true
224
36
    property bool windowMoving: false
225
36
37
226
37
    readonly property real buttonsWidth: buttons.width + row.spacing
38
    readonly property real buttonsWidth: buttons.width + row.spacing
227
38
39
228
39
    acceptedButtons: Qt.AllButtons // prevent leaking unhandled mouse events
40
    acceptedButtons: Qt.AllButtons // prevent leaking unhandled mouse events
229
40
    hoverEnabled: true
41
    hoverEnabled: true
230
41
42
231
42
    drag.target: Item {}
232
43
    drag.filterChildren: true
233
44
    drag.threshold: 0
234
45
235
46
    signal closeClicked()
43
    signal closeClicked()
236
47
    signal minimizeClicked()
44
    signal minimizeClicked()
237
48
    signal maximizeClicked()
45
    signal maximizeClicked()
238
49
    signal maximizeHorizontallyClicked()
46
    signal maximizeHorizontallyClicked()
239
50
    signal maximizeVerticallyClicked()
47
    signal maximizeVerticallyClicked()
240
51
48
242
52
    onClicked: mouse.accepted = true // propogated event
49
    signal pressedChangedEx(bool pressed, var pressedButtons, real mouseX, real mouseY)
243
50
244
53
    onDoubleClicked: {
51
    onDoubleClicked: {
245
54
        if (mouse.button == Qt.LeftButton) {
52
        if (mouse.button == Qt.LeftButton) {
246
55
            root.maximizeClicked();
53
            root.maximizeClicked();
247
@@ -69,13 +67,6 @@
248
69
                                       (menuBar.showRequested || root.containsMouse)
67
                                       (menuBar.showRequested || root.containsMouse)
249
70
    }
68
    }
250
71
69
251
72
    // We dont want touch events to fall through to parent as it expect some child MouseArea to have them
252
73
    // If not some MouseArea in the menu bar, it will be this one.
253
74
    MouseArea {
254
75
        anchors.fill: parent
255
76
        propagateComposedEvents: true
256
77
    }
257
78
258
79
    Rectangle {
70
    Rectangle {
259
80
        id: background
71
        id: background
260
81
        anchors.fill: parent
72
        anchors.fill: parent
261
@@ -136,7 +127,7 @@
262
136
                fontSize: "medium"
127
                fontSize: "medium"
263
137
                font.weight: root.active ? Font.Light : Font.Medium
128
                font.weight: root.active ? Font.Light : Font.Medium
264
138
                elide: Text.ElideRight
129
                elide: Text.ElideRight
266
139
                opacity: overlayShown || priv.shouldShowMenus ? 0 : 1
130
                opacity: overlayShown || menuBarLoader.visible ? 0 : 1
267
140
                visible: opacity != 0
131
                visible: opacity != 0
268
141
                Behavior on opacity { UbuntuNumberAnimation {} }
132
                Behavior on opacity { UbuntuNumberAnimation {} }
269
142
            }
133
            }
270
@@ -154,9 +145,16 @@
271
154
                    height: menuBarLoader.height
145
                    height: menuBarLoader.height
272
155
                    enableKeyFilter: valid && root.active && root.enableMenus
146
                    enableKeyFilter: valid && root.active && root.enableMenus
273
156
                    unityMenuModel: root.menu
147
                    unityMenuModel: root.menu
274
148
                    windowMoving: root.windowMoving
275
149
276
150
                    onPressed: root.onPressed(mouse)
277
151
                    onPressedChangedEx: root.pressedChangedEx(pressed, pressedButtons, mouseX, mouseY)
278
152
                    onPositionChanged: root.onPositionChanged(mouse)
279
153
                    onReleased: root.onReleased(mouse)
280
154
                    onDoubleClicked: root.onDoubleClicked(mouse)
281
157
                }
155
                }
282
158
156
284
159
                opacity: !overlayShown && priv.shouldShowMenus ? 1 : 0
157
                opacity: (!overlayShown && priv.shouldShowMenus) || (active && priv.menuBar.valid && root.windowMoving) ? 1 : 0
285
160
                visible: opacity == 1
158
                visible: opacity == 1
286
161
                Behavior on opacity { UbuntuNumberAnimation {} }
159
                Behavior on opacity { UbuntuNumberAnimation {} }
287
162
            }
160
            }
288
163
161
289
=== modified file 'tests/qmltests/ApplicationMenus/tst_MenuBar.qml'
290
--- tests/qmltests/ApplicationMenus/tst_MenuBar.qml	2017-03-03 10:22:19 +0000
291
+++ tests/qmltests/ApplicationMenus/tst_MenuBar.qml	2017-03-03 10:22:19 +0000
292
@@ -98,6 +98,7 @@
293
98
            var menuItem2 = findChild(menuBar, "menuBar-item2"); verify(menuItem2);
98
            var menuItem2 = findChild(menuBar, "menuBar-item2"); verify(menuItem2);
294
99
99
295
100
            menuItem0.show();
100
            menuItem0.show();
296
101
            mouseMove(menuItem0, menuItem0.width/2, menuItem0.height/2);
297
101
            compare(priv.currentItem, menuItem0, "CurrentItem should be set to item 0");
102
            compare(priv.currentItem, menuItem0, "CurrentItem should be set to item 0");
298
102
            compare(priv.currentItem.popupVisible, true, "Popup should be visible");
103
            compare(priv.currentItem.popupVisible, true, "Popup should be visible");
299
103
104
300
@@ -179,6 +180,7 @@
301
179
180
302
180
            keyPress(data.tag, Qt.AltModifier, 100);
181
            keyPress(data.tag, Qt.AltModifier, 100);
303
181
            tryCompare(priv, "currentItem", menuItem);
182
            tryCompare(priv, "currentItem", menuItem);
304
183
            keyRelease(data.tag, Qt.AltModifier, 100);
305
182
        }
184
        }
306
183
185
307
184
        function test_menuActivateClosesMenu() {
186
        function test_menuActivateClosesMenu() {
308
185
187
309
=== modified file 'tests/qmltests/Stage/tst_DesktopStage.qml'
310
--- tests/qmltests/Stage/tst_DesktopStage.qml	2017-02-16 13:43:56 +0000
311
+++ tests/qmltests/Stage/tst_DesktopStage.qml	2017-03-03 10:22:19 +0000
312
@@ -1013,5 +1013,23 @@
313
1013
            expectFail("", "Hovering the window controls should be ignored when the menu is open");
1013
            expectFail("", "Hovering the window controls should be ignored when the menu is open");
314
1014
            tryCompare(closeButton, "containsMouse", true);
1014
            tryCompare(closeButton, "containsMouse", true);
315
1015
        }
1015
        }
316
1016
317
1017
        function test_windowControlsTouchInteractionWithMenu() {
318
1018
            var appDelegate = startApplication("gmail-webapp");
319
1019
320
1020
            var wd = findChild(appDelegate, "appWindowDecoration");
321
1021
            var maxButton = findChild(wd, "maximizeWindowButton");
322
1022
            var menuBarLoader = findChild(wd, "menuBarLoader");
323
1023
            var menuNav = findInvisibleChild(menuBarLoader, "d");
324
1024
325
1025
            // make the menubar active and visible, select first item
326
1026
            menuBarLoader.active = true;
327
1027
            menuNav.select(0);
328
1028
            tryCompare(menuBarLoader.item, "visible", true);
329
1029
330
1030
            // verify the maximized button can still be tapped
331
1031
            tap(maxButton);
332
1032
            tryCompare(appDelegate, "state", "maximized");
333
1033
        }
334
1016
    }
1034
    }
335
1017
}
1035
}
336
1018
1036
337
=== modified file 'tests/qmltests/tst_Shell.qml'
338
--- tests/qmltests/tst_Shell.qml	2017-02-16 13:46:11 +0000
339
+++ tests/qmltests/tst_Shell.qml	2017-03-03 10:22:19 +0000
340
@@ -2910,5 +2910,29 @@
341
2910
            tryCompare(topLevelSurfaceList.focusedWindow, "surface", appDelegate.surface);
2910
            tryCompare(topLevelSurfaceList.focusedWindow, "surface", appDelegate.surface);
342
2911
            tryCompare(topLevelSurfaceList.applicationAt(0), "appId", "dialer-app");
2911
            tryCompare(topLevelSurfaceList.applicationAt(0), "appId", "dialer-app");
343
2912
        }
2912
        }
344
2913
345
2914
        function test_doubleClickPanelRestoresWindow() {
346
2915
            loadShell("desktop");
347
2916
            shell.usageScenario = "desktop";
348
2917
            waitForRendering(shell);
349
2918
            swipeAwayGreeter();
350
2919
351
2920
            // start dialer
352
2921
            var appDelegate = startApplication("dialer-app")
353
2922
            verify(appDelegate);
354
2923
            tryCompare(appDelegate, "state", "normal");
355
2924
356
2925
            // maximize dialer
357
2926
            var decoration = findChild(appDelegate, "appWindowDecoration");
358
2927
            verify(decoration);
359
2928
            mouseDoubleClickSequence(decoration);
360
2929
            tryCompare(appDelegate, "state", "maximized");
361
2930
362
2931
            // double click the panel
363
2932
            var panel = findChild(shell, "panel");
364
2933
            verify(panel);
365
2934
            mouseDoubleClickSequence(panel, panel.width/2, PanelState.panelHeight/2, Qt.LeftButton, Qt.NoModifier, 300);
366
2935
            tryCompare(appDelegate, "state", "restored");
367
2936
        }
368
2913
    }
2937
    }
369
2914
}
2938
}
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2017-03-02	Approve on 2017-03-03
Albert Astals Cid (community)		2017-03-02	Approve on 2017-03-03
Review via email: mp+318850@code.launchpad.net
1	=== modified file 'qml/ApplicationMenus/MenuBar.qml'
2	--- qml/ApplicationMenus/MenuBar.qml 2017-03-03 10:22:19 +0000
3	+++ qml/ApplicationMenus/MenuBar.qml 2017-03-03 10:22:19 +0000
4	@@ -28,11 +28,19 @@
5	28	property alias unityMenuModel: rowRepeater.model	28	property alias unityMenuModel: rowRepeater.model
6	29	property bool enableKeyFilter: false	29	property bool enableKeyFilter: false
7	30	property real overflowWidth: width	30	property real overflowWidth: width
8			31	property bool windowMoving: false
9	31		32
10	32	// read from outside	33	// read from outside
11	33	readonly property bool valid: rowRepeater.count > 0	34	readonly property bool valid: rowRepeater.count > 0
12	34	readonly property bool showRequested: d.longAltPressed \|\| d.currentItem != null	35	readonly property bool showRequested: d.longAltPressed \|\| d.currentItem != null
13	35		36
14			37	// MoveHandler API for DecoratedWindow
15			38	signal pressed(var mouse)
16			39	signal pressedChangedEx(bool pressed, var pressedButtons, real mouseX, real mouseY)
17			40	signal positionChanged(var mouse)
18			41	signal released(var mouse)
19			42	signal doubleClicked(var mouse)
20			43
21	36	implicitWidth: row.width	44	implicitWidth: row.width
22	37	height: parent.height	45	height: parent.height
23	38		46
24	@@ -77,7 +85,7 @@
25	77	anchors.fill: parent	85	anchors.fill: parent
26	78	enabled: d.currentItem != null	86	enabled: d.currentItem != null
27	79	hoverEnabled: enabled && d.currentItem && d.currentItem.__popup != null	87	hoverEnabled: enabled && d.currentItem && d.currentItem.__popup != null
29	80	onPressed: d.dismissAll()	88	onPressed: { mouse.accepted = false; d.dismissAll(); }
30	81	}	89	}
31	82		90
32	83	Row {	91	Row {
33	@@ -218,26 +226,42 @@
34	218	} // Row	226	} // Row
35	219		227
36	220	MouseArea {	228	MouseArea {
38	221	anchors.fill: row	229	anchors.fill: parent
39	222	hoverEnabled: d.currentItem	230	hoverEnabled: d.currentItem
40	223		231
41			232	property bool moved: false
42			233
43	224	onEntered: {	234	onEntered: {
44	225	if (d.currentItem) {	235	if (d.currentItem) {
45	226	updateCurrentItemFromPosition(Qt.point(mouseX, mouseY))	236	updateCurrentItemFromPosition(Qt.point(mouseX, mouseY))
46	227	}	237	}
47	228	}	238	}
49	229	onPositionChanged: {	239
50			240	onClicked: {
51			241	if (!moved) {
52			242	var prevItem = d.currentItem;
53			243	updateCurrentItemFromPosition(Qt.point(mouseX, mouseY));
54			244	if (prevItem && d.currentItem == prevItem) {
55			245	prevItem.hide();
56			246	}
57			247	}
58			248	moved = false;
59			249	}
60			250
61			251	// for the MoveHandler
62			252	onPressed: root.pressed(mouse)
63			253	onPressedChanged: root.pressedChangedEx(pressed, pressedButtons, mouseX, mouseY)
64			254	onReleased: root.released(mouse)
65			255	onDoubleClicked: root.doubleClicked(mouse)
66			256
67			257	Mouse.ignoreSynthesizedEvents: true
68			258	Mouse.onPositionChanged: {
69			259	root.positionChanged(mouse);
70			260	moved = root.windowMoving;
71	230	if (d.currentItem) {	261	if (d.currentItem) {
72	231	updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))	262	updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
73	232	}	263	}
74	233	}	264	}
75	234	onClicked: {
76	235	var prevItem = d.currentItem;
77	236	updateCurrentItemFromPosition(Qt.point(mouse.x, mouse.y))
78	237	if (prevItem && d.currentItem == prevItem) {
79	238	prevItem.hide();
80	239	}
81	240	}
82	241		265
83	242	function updateCurrentItemFromPosition(point) {	266	function updateCurrentItemFromPosition(point) {
84	243	var pos = mapToItem(row, point.x, point.y);	267	var pos = mapToItem(row, point.x, point.y);
85	@@ -260,7 +284,7 @@
86	260	hoverEnabled: d.currentItem	284	hoverEnabled: d.currentItem
87	261	onEntered: d.currentItem = this	285	onEntered: d.currentItem = this
88	262	onPositionChanged: d.currentItem = this	286	onPositionChanged: d.currentItem = this
90	263	onClicked: d.currentItem = this	287	onPressed: d.currentItem = this
91	264		288
92	265	property Item __popup: null;	289	property Item __popup: null;
93	266	readonly property bool popupVisible: __popup && __popup.visible	290	readonly property bool popupVisible: __popup && __popup.visible
94	267		291
95	=== modified file 'qml/Components/WindowControlButtons.qml'
96	--- qml/Components/WindowControlButtons.qml 2017-01-26 11:10:01 +0000
97	+++ qml/Components/WindowControlButtons.qml 2017-03-03 10:22:19 +0000
98	@@ -47,13 +47,6 @@
99	47	onClicked: root.closeClicked()	47	onClicked: root.closeClicked()
100	48	visible: root.closeButtonShown	48	visible: root.closeButtonShown
101	49		49
102	50	// We dont want touch events to fall through to parent,
103	51	// otherwise the containsMouse will not work.
104	52	MouseArea {
105	53	anchors.fill: parent
106	54	propagateComposedEvents: true
107	55	}
108	56
109	57	Rectangle {	50	Rectangle {
110	58	anchors.fill: parent	51	anchors.fill: parent
111	59	anchors.margins: windowIsMaximized ? units.dp(3) : 0	52	anchors.margins: windowIsMaximized ? units.dp(3) : 0
112	@@ -78,13 +71,6 @@
113	78	onClicked: root.minimizeClicked()	71	onClicked: root.minimizeClicked()
114	79	visible: root.minimizeButtonVisible	72	visible: root.minimizeButtonVisible
115	80		73
116	81	// We dont want touch events to fall through to parent,
117	82	// otherwise the containsMouse will not work.
118	83	MouseArea {
119	84	anchors.fill: parent
120	85	propagateComposedEvents: true
121	86	}
122	87
123	88	Rectangle {	74	Rectangle {
124	89	anchors.fill: parent	75	anchors.fill: parent
125	90	anchors.margins: windowIsMaximized ? units.dp(3) : 0	76	anchors.margins: windowIsMaximized ? units.dp(3) : 0
126	@@ -118,13 +104,6 @@
127	118	}	104	}
128	119	}	105	}
129	120		106
130	121	// We dont want touch events to fall through to parent,
131	122	// otherwise the containsMouse will not work.
132	123	MouseArea {
133	124	anchors.fill: parent
134	125	propagateComposedEvents: true
135	126	}
136	127
137	128	Rectangle {	107	Rectangle {
138	129	anchors.fill: parent	108	anchors.fill: parent
139	130	anchors.margins: windowIsMaximized ? units.dp(3) : 0	109	anchors.margins: windowIsMaximized ? units.dp(3) : 0
140	131		110
141	=== modified file 'qml/Panel/Panel.qml'
142	--- qml/Panel/Panel.qml 2017-02-07 14:10:41 +0000
143	+++ qml/Panel/Panel.qml 2017-03-03 10:22:19 +0000
144	@@ -231,6 +231,8 @@
145	231	target: __indicators	231	target: __indicators
146	232	onShownChanged: bar.dismiss();	232	onShownChanged: bar.dismiss();
147	233	}	233	}
148			234
149			235	onDoubleClicked: PanelState.restoreClicked()
150	234	}	236	}
151	235	}	237	}
152	236	}	238	}
153	237		239
154	=== modified file 'qml/Stage/DecoratedWindow.qml'
155	--- qml/Stage/DecoratedWindow.qml 2017-01-26 11:10:01 +0000
156	+++ qml/Stage/DecoratedWindow.qml 2017-03-03 10:22:19 +0000
157	@@ -204,12 +204,14 @@
158	204	height: units.gu(3)	204	height: units.gu(3)
159	205		205
160	206	title: applicationWindow.title	206	title: applicationWindow.title
161			207	windowMoving: moveHandler.moving && !altDragHandler.dragging
162	207		208
163	208	opacity: root.hasDecoration ? Math.min(1, root.showDecoration) : 0	209	opacity: root.hasDecoration ? Math.min(1, root.showDecoration) : 0
164	209	Behavior on opacity { UbuntuNumberAnimation { } }	210	Behavior on opacity { UbuntuNumberAnimation { } }
165	210		211
166	211	onPressed: root.decorationPressed();	212	onPressed: root.decorationPressed();
167	212	onPressedChanged: moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY)	213	onPressedChanged: moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY)
168			214	onPressedChangedEx: moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY)
169	213	onPositionChanged: moveHandler.handlePositionChanged(mouse)	215	onPositionChanged: moveHandler.handlePositionChanged(mouse)
170	214	onReleased: {	216	onReleased: {
171	215	root.decorationReleased();	217	root.decorationReleased();
172	@@ -255,6 +257,7 @@
173	255	}	257	}
174	256		258
175	257	MouseArea {	259	MouseArea {
176			260	id: altDragHandler
177	258	anchors.fill: applicationWindow	261	anchors.fill: applicationWindow
178	259	acceptedButtons: Qt.LeftButton	262	acceptedButtons: Qt.LeftButton
179	260	property bool dragging: false	263	property bool dragging: false
180	261		264
181	=== modified file 'qml/Stage/MoveHandler.qml'
182	--- qml/Stage/MoveHandler.qml 2017-01-26 11:10:01 +0000
183	+++ qml/Stage/MoveHandler.qml 2017-03-03 10:22:19 +0000
184	@@ -29,6 +29,7 @@
185	29	property real boundsTopMargin: 0	29	property real boundsTopMargin: 0
186	30		30
187	31	readonly property bool dragging: priv.dragging	31	readonly property bool dragging: priv.dragging
188			32	readonly property bool moving: priv.moving
189	32		33
190	33	signal fakeMaximizeAnimationRequested(real amount)	34	signal fakeMaximizeAnimationRequested(real amount)
191	34	signal fakeMaximizeLeftAnimationRequested(real amount)	35	signal fakeMaximizeLeftAnimationRequested(real amount)
192	@@ -43,6 +44,7 @@
193	43	property real distanceX	44	property real distanceX
194	44	property real distanceY	45	property real distanceY
195	45	property bool dragging	46	property bool dragging
196			47	property bool moving
197	46		48
198	47	readonly property int triggerArea: units.gu(8)	49	readonly property int triggerArea: units.gu(8)
199	48	property bool nearLeftEdge: target.maximizedLeft	50	property bool nearLeftEdge: target.maximizedLeft
200	@@ -110,6 +112,7 @@
201	110		112
202	111	function handlePositionChanged(mouse, sensingPoints) {	113	function handlePositionChanged(mouse, sensingPoints) {
203	112	if (priv.dragging) {	114	if (priv.dragging) {
204			115	priv.moving = true;
205	113	priv.mouseDownTimer.stop();	116	priv.mouseDownTimer.stop();
206	114	Mir.cursorName = "grabbing";	117	Mir.cursorName = "grabbing";
207	115		118
208	@@ -180,6 +183,7 @@
209	180	}	183	}
210	181		184
211	182	function handleReleased(touchMode) {	185	function handleReleased(touchMode) {
212			186	priv.moving = false;
213	183	if (touchMode) {	187	if (touchMode) {
214	184	priv.progress = 0;	188	priv.progress = 0;
215	185	priv.resetEdges();	189	priv.resetEdges();
216	186		190
217	=== modified file 'qml/Stage/WindowDecoration.qml'
218	--- qml/Stage/WindowDecoration.qml 2017-01-26 11:10:01 +0000
219	+++ qml/Stage/WindowDecoration.qml 2017-03-03 10:22:19 +0000
220	@@ -33,23 +33,21 @@
221	33	property alias overlayShown: buttons.overlayShown	33	property alias overlayShown: buttons.overlayShown
222	34	property var menu: undefined	34	property var menu: undefined
223	35	property bool enableMenus: true	35	property bool enableMenus: true
224			36	property bool windowMoving: false
225	36		37
226	37	readonly property real buttonsWidth: buttons.width + row.spacing	38	readonly property real buttonsWidth: buttons.width + row.spacing
227	38		39
228	39	acceptedButtons: Qt.AllButtons // prevent leaking unhandled mouse events	40	acceptedButtons: Qt.AllButtons // prevent leaking unhandled mouse events
229	40	hoverEnabled: true	41	hoverEnabled: true
230	41		42
231	42	drag.target: Item {}
232	43	drag.filterChildren: true
233	44	drag.threshold: 0
234	45
235	46	signal closeClicked()	43	signal closeClicked()
236	47	signal minimizeClicked()	44	signal minimizeClicked()
237	48	signal maximizeClicked()	45	signal maximizeClicked()
238	49	signal maximizeHorizontallyClicked()	46	signal maximizeHorizontallyClicked()
239	50	signal maximizeVerticallyClicked()	47	signal maximizeVerticallyClicked()
240	51		48
242	52	onClicked: mouse.accepted = true // propogated event	49	signal pressedChangedEx(bool pressed, var pressedButtons, real mouseX, real mouseY)
243			50
244	53	onDoubleClicked: {	51	onDoubleClicked: {
245	54	if (mouse.button == Qt.LeftButton) {	52	if (mouse.button == Qt.LeftButton) {
246	55	root.maximizeClicked();	53	root.maximizeClicked();
247	@@ -69,13 +67,6 @@
248	69	(menuBar.showRequested \|\| root.containsMouse)	67	(menuBar.showRequested \|\| root.containsMouse)
249	70	}	68	}
250	71		69
251	72	// We dont want touch events to fall through to parent as it expect some child MouseArea to have them
252	73	// If not some MouseArea in the menu bar, it will be this one.
253	74	MouseArea {
254	75	anchors.fill: parent
255	76	propagateComposedEvents: true
256	77	}
257	78
258	79	Rectangle {	70	Rectangle {
259	80	id: background	71	id: background
260	81	anchors.fill: parent	72	anchors.fill: parent
261	@@ -136,7 +127,7 @@
262	136	fontSize: "medium"	127	fontSize: "medium"
263	137	font.weight: root.active ? Font.Light : Font.Medium	128	font.weight: root.active ? Font.Light : Font.Medium
264	138	elide: Text.ElideRight	129	elide: Text.ElideRight
266	139	opacity: overlayShown \|\| priv.shouldShowMenus ? 0 : 1	130	opacity: overlayShown \|\| menuBarLoader.visible ? 0 : 1
267	140	visible: opacity != 0	131	visible: opacity != 0
268	141	Behavior on opacity { UbuntuNumberAnimation {} }	132	Behavior on opacity { UbuntuNumberAnimation {} }
269	142	}	133	}
270	@@ -154,9 +145,16 @@
271	154	height: menuBarLoader.height	145	height: menuBarLoader.height
272	155	enableKeyFilter: valid && root.active && root.enableMenus	146	enableKeyFilter: valid && root.active && root.enableMenus
273	156	unityMenuModel: root.menu	147	unityMenuModel: root.menu
274			148	windowMoving: root.windowMoving
275			149
276			150	onPressed: root.onPressed(mouse)
277			151	onPressedChangedEx: root.pressedChangedEx(pressed, pressedButtons, mouseX, mouseY)
278			152	onPositionChanged: root.onPositionChanged(mouse)
279			153	onReleased: root.onReleased(mouse)
280			154	onDoubleClicked: root.onDoubleClicked(mouse)
281	157	}	155	}
282	158		156
284	159	opacity: !overlayShown && priv.shouldShowMenus ? 1 : 0	157	opacity: (!overlayShown && priv.shouldShowMenus) \|\| (active && priv.menuBar.valid && root.windowMoving) ? 1 : 0
285	160	visible: opacity == 1	158	visible: opacity == 1
286	161	Behavior on opacity { UbuntuNumberAnimation {} }	159	Behavior on opacity { UbuntuNumberAnimation {} }
287	162	}	160	}
288	163		161
289	=== modified file 'tests/qmltests/ApplicationMenus/tst_MenuBar.qml'
290	--- tests/qmltests/ApplicationMenus/tst_MenuBar.qml 2017-03-03 10:22:19 +0000
291	+++ tests/qmltests/ApplicationMenus/tst_MenuBar.qml 2017-03-03 10:22:19 +0000
292	@@ -98,6 +98,7 @@
293	98	var menuItem2 = findChild(menuBar, "menuBar-item2"); verify(menuItem2);	98	var menuItem2 = findChild(menuBar, "menuBar-item2"); verify(menuItem2);
294	99		99
295	100	menuItem0.show();	100	menuItem0.show();
296			101	mouseMove(menuItem0, menuItem0.width/2, menuItem0.height/2);
297	101	compare(priv.currentItem, menuItem0, "CurrentItem should be set to item 0");	102	compare(priv.currentItem, menuItem0, "CurrentItem should be set to item 0");
298	102	compare(priv.currentItem.popupVisible, true, "Popup should be visible");	103	compare(priv.currentItem.popupVisible, true, "Popup should be visible");
299	103		104
300	@@ -179,6 +180,7 @@
301	179		180
302	180	keyPress(data.tag, Qt.AltModifier, 100);	181	keyPress(data.tag, Qt.AltModifier, 100);
303	181	tryCompare(priv, "currentItem", menuItem);	182	tryCompare(priv, "currentItem", menuItem);
304			183	keyRelease(data.tag, Qt.AltModifier, 100);
305	182	}	184	}
306	183		185
307	184	function test_menuActivateClosesMenu() {	186	function test_menuActivateClosesMenu() {
308	185		187
309	=== modified file 'tests/qmltests/Stage/tst_DesktopStage.qml'
310	--- tests/qmltests/Stage/tst_DesktopStage.qml 2017-02-16 13:43:56 +0000
311	+++ tests/qmltests/Stage/tst_DesktopStage.qml 2017-03-03 10:22:19 +0000
312	@@ -1013,5 +1013,23 @@
313	1013	expectFail("", "Hovering the window controls should be ignored when the menu is open");	1013	expectFail("", "Hovering the window controls should be ignored when the menu is open");
314	1014	tryCompare(closeButton, "containsMouse", true);	1014	tryCompare(closeButton, "containsMouse", true);
315	1015	}	1015	}
316			1016
317			1017	function test_windowControlsTouchInteractionWithMenu() {
318			1018	var appDelegate = startApplication("gmail-webapp");
319			1019
320			1020	var wd = findChild(appDelegate, "appWindowDecoration");
321			1021	var maxButton = findChild(wd, "maximizeWindowButton");
322			1022	var menuBarLoader = findChild(wd, "menuBarLoader");
323			1023	var menuNav = findInvisibleChild(menuBarLoader, "d");
324			1024
325			1025	// make the menubar active and visible, select first item
326			1026	menuBarLoader.active = true;
327			1027	menuNav.select(0);
328			1028	tryCompare(menuBarLoader.item, "visible", true);
329			1029
330			1030	// verify the maximized button can still be tapped
331			1031	tap(maxButton);
332			1032	tryCompare(appDelegate, "state", "maximized");
333			1033	}
334	1016	}	1034	}
335	1017	}	1035	}
336	1018		1036
337	=== modified file 'tests/qmltests/tst_Shell.qml'
338	--- tests/qmltests/tst_Shell.qml 2017-02-16 13:46:11 +0000
339	+++ tests/qmltests/tst_Shell.qml 2017-03-03 10:22:19 +0000
340	@@ -2910,5 +2910,29 @@
341	2910	tryCompare(topLevelSurfaceList.focusedWindow, "surface", appDelegate.surface);	2910	tryCompare(topLevelSurfaceList.focusedWindow, "surface", appDelegate.surface);
342	2911	tryCompare(topLevelSurfaceList.applicationAt(0), "appId", "dialer-app");	2911	tryCompare(topLevelSurfaceList.applicationAt(0), "appId", "dialer-app");
343	2912	}	2912	}
344			2913
345			2914	function test_doubleClickPanelRestoresWindow() {
346			2915	loadShell("desktop");
347			2916	shell.usageScenario = "desktop";
348			2917	waitForRendering(shell);
349			2918	swipeAwayGreeter();
350			2919
351			2920	// start dialer
352			2921	var appDelegate = startApplication("dialer-app")
353			2922	verify(appDelegate);
354			2923	tryCompare(appDelegate, "state", "normal");
355			2924
356			2925	// maximize dialer
357			2926	var decoration = findChild(appDelegate, "appWindowDecoration");
358			2927	verify(decoration);
359			2928	mouseDoubleClickSequence(decoration);
360			2929	tryCompare(appDelegate, "state", "maximized");
361			2930
362			2931	// double click the panel
363			2932	var panel = findChild(shell, "panel");
364			2933	verify(panel);
365			2934	mouseDoubleClickSequence(panel, panel.width/2, PanelState.panelHeight/2, Qt.LeftButton, Qt.NoModifier, 300);
366			2935	tryCompare(appDelegate, "state", "restored");
367			2936	}
368	2913	}	2937	}
369	2914	}	2938	}