1
=== modified file 'data/com.canonical.Unity8.gschema.xml'
2
--- data/com.canonical.Unity8.gschema.xml	2015-11-24 17:44:18 +0000
3
+++ data/com.canonical.Unity8.gschema.xml	2016-02-19 15:10:34 +0000
4
@@ -27,6 +27,17 @@
5
27
      <summary>Maximum push needed to overcome edge barrier</summary>
27
      <summary>Maximum push needed to overcome edge barrier</summary>
6
28
      <description>How much you have to push (in grid units) the mouse against an edge barrier when sensibility is 1.</description>
28
      <description>How much you have to push (in grid units) the mouse against an edge barrier when sensibility is 1.</description>
7
29
    </key>
29
    </key>
8
30
    <key type="b" name="autohide-launcher">
9
31
      <default>false</default>
10
32
      <summary>Autohide the launcher</summary>
11
33
      <description>This will only be applied in windowed mode. In staged mode, the launcher will always hide.</description>
12
34
    </key>
13
35
    <key type="u" name="launcher-width">
14
36
      <default>8</default>
15
37
      <range min="6" max="12"/>
16
38
      <summary>Width of the launcher in grid units.</summary>
17
39
      <description>Changes the width of the launcher in all usage modes.</description>
18
40
    </key>
19
30
  </schema>
41
  </schema>
20
31
42
21
32
  <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
43
  <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
22
33
44
23
=== modified file 'qml/Launcher/Launcher.qml'
24
--- qml/Launcher/Launcher.qml	2016-02-19 15:10:33 +0000
25
+++ qml/Launcher/Launcher.qml	2016-02-19 15:10:34 +0000
26
@@ -25,11 +25,12 @@
27
25
    id: root
25
    id: root
28
26
26
29
27
    property bool autohideEnabled: false
27
    property bool autohideEnabled: false
30
28
    property bool lockedVisible: false
31
28
    property bool available: true // can be used to disable all interactions
29
    property bool available: true // can be used to disable all interactions
32
29
    property alias inverted: panel.inverted
30
    property alias inverted: panel.inverted
33
30
    property bool shadeBackground: true // can be used to disable background shade when launcher is visible
31
    property bool shadeBackground: true // can be used to disable background shade when launcher is visible
34
31
32
36
32
    property int panelWidth: units.gu(8)
33
    property int panelWidth: units.gu(10)
37
33
    property int dragAreaWidth: units.gu(1)
34
    property int dragAreaWidth: units.gu(1)
38
34
    property int minimizeDistance: units.gu(26)
35
    property int minimizeDistance: units.gu(26)
39
35
    property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
36
    property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
40
@@ -92,12 +93,24 @@
41
92
        }
93
        }
42
93
    }
94
    }
43
94
95
44
96
    onLockedVisibleChanged: {
45
97
        if (lockedVisible && state == "") {
46
98
            panel.dismissTimer.stop();
47
99
            fadeOutAnimation.stop();
48
100
            switchToNextState("visible")
49
101
        } else if (!lockedVisible && state == "visible") {
50
102
            hide();
51
103
        }
52
104
    }
53
105
54
95
    function hide() {
106
    function hide() {
55
96
        switchToNextState("")
107
        switchToNextState("")
56
97
    }
108
    }
57
98
109
58
99
    function fadeOut() {
110
    function fadeOut() {
60
100
        fadeOutAnimation.start();
111
        if (!root.lockedVisible) {
61
112
            fadeOutAnimation.start();
62
113
        }
63
101
    }
114
    }
64
102
115
65
103
    function switchToNextState(state) {
116
    function switchToNextState(state) {
66
@@ -172,7 +185,7 @@
67
172
            } else if (panel.highlightIndex >= 0) {
185
            } else if (panel.highlightIndex >= 0) {
68
173
                launcherApplicationSelected(LauncherModel.get(panel.highlightIndex).appId);
186
                launcherApplicationSelected(LauncherModel.get(panel.highlightIndex).appId);
69
174
            }
187
            }
71
175
            root.state = ""
188
            root.hide();
72
176
            event.accepted = true;
189
            event.accepted = true;
73
177
            root.focus = false;
190
            root.focus = false;
74
178
        }
191
        }
75
@@ -211,6 +224,13 @@
76
211
        interval: 1
224
        interval: 1
77
212
        property string nextState: ""
225
        property string nextState: ""
78
213
        onTriggered: {
226
        onTriggered: {
79
227
            if (root.lockedVisible && nextState == "") {
80
228
                // Due to binding updates when switching between modes
81
229
                // it could happen that our request to show will be overwritten
82
230
                // with a hide request. Rewrite it when we know hiding is not allowed.
83
231
                nextState = "visible"
84
232
            }
85
233
86
214
            // switching to an intermediate state here to make sure all the
234
            // switching to an intermediate state here to make sure all the
87
215
            // values are restored, even if we were already in the target state
235
            // values are restored, even if we were already in the target state
88
216
            root.state = "tmp"
236
            root.state = "tmp"
89
@@ -256,7 +276,7 @@
90
256
276
91
257
    MouseArea {
277
    MouseArea {
92
258
        id: launcherDragArea
278
        id: launcherDragArea
94
259
        enabled: root.available && (root.state == "visible" || root.state == "visibleTemporary")
279
        enabled: root.available && (root.state == "visible" || root.state == "visibleTemporary") && !root.lockedVisible
95
260
        anchors.fill: panel
280
        anchors.fill: panel
96
261
        anchors.rightMargin: -units.gu(2)
281
        anchors.rightMargin: -units.gu(2)
97
262
        drag {
282
        drag {
98
@@ -277,9 +297,10 @@
99
277
    InverseMouseArea {
297
    InverseMouseArea {
100
278
        id: closeMouseArea
298
        id: closeMouseArea
101
279
        anchors.fill: panel
299
        anchors.fill: panel
103
280
        enabled: root.shadeBackground && root.state == "visible"
300
        enabled: root.shadeBackground && root.state == "visible" && (!root.lockedVisible || panel.highlightIndex >= -1)
104
281
        visible: enabled
301
        visible: enabled
105
282
        onPressed: {
302
        onPressed: {
106
303
            panel.highlightIndex = -2
107
283
            root.hide();
304
            root.hide();
108
284
        }
305
        }
109
285
    }
306
    }
110
@@ -288,7 +309,7 @@
111
288
        id: backgroundShade
309
        id: backgroundShade
112
289
        anchors.fill: parent
310
        anchors.fill: parent
113
290
        color: "black"
311
        color: "black"
115
291
        opacity: root.shadeBackground && root.state == "visible" ? 0.6 : 0
312
        opacity: root.shadeBackground && root.state == "visible" && !root.lockedVisible ? 0.6 : 0
116
292
313
117
293
        Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.BriskDuration } }
314
        Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.BriskDuration } }
118
294
    }
315
    }
119
@@ -332,9 +353,9 @@
120
332
        Connections {
353
        Connections {
121
333
            target: panel.dismissTimer
354
            target: panel.dismissTimer
122
334
            onTriggered: {
355
            onTriggered: {
124
335
                if (root.autohideEnabled) {
356
                if (root.autohideEnabled && !root.lockedVisible) {
125
336
                    if (!panel.preventHiding) {
357
                    if (!panel.preventHiding) {
127
337
                        root.state = ""
358
                        root.hide();
128
338
                    } else {
359
                    } else {
129
339
                        panel.dismissTimer.restart()
360
                        panel.dismissTimer.restart()
130
340
                    }
361
                    }
131
@@ -345,11 +366,11 @@
132
345
        property bool animate: true
366
        property bool animate: true
133
346
367
134
347
        onApplicationSelected: {
368
        onApplicationSelected: {
136
348
            root.state = ""
369
            root.hide();
137
349
            launcherApplicationSelected(appId)
370
            launcherApplicationSelected(appId)
138
350
        }
371
        }
139
351
        onShowDashHome: {
372
        onShowDashHome: {
141
352
            root.state = ""
373
            root.hide();
142
353
            root.showDashHome();
374
            root.showDashHome();
143
354
        }
375
        }
144
355
376
145
@@ -360,7 +381,8 @@
146
360
        }
381
        }
147
361
382
148
362
        onKbdNavigationCancelled: {
383
        onKbdNavigationCancelled: {
150
363
            root.state = "";
384
            panel.highlightIndex = -2;
151
385
            root.hide();
152
364
            root.focus = false;
386
            root.focus = false;
153
365
        }
387
        }
154
366
388
155
367
389
156
=== modified file 'qml/Launcher/LauncherDelegate.qml'
157
--- qml/Launcher/LauncherDelegate.qml	2016-02-19 15:10:33 +0000
158
+++ qml/Launcher/LauncherDelegate.qml	2016-02-19 15:10:34 +0000
159
@@ -124,7 +124,7 @@
160
124
124
161
125
    Item {
125
    Item {
162
126
        id: iconItem
126
        id: iconItem
164
127
        width: parent.itemWidth + units.gu(1)
127
        width: root.width
165
128
        height: parent.itemHeight + units.gu(1)
128
        height: parent.itemHeight + units.gu(1)
166
129
        anchors.centerIn: parent
129
        anchors.centerIn: parent
167
130
130
168
@@ -142,7 +142,7 @@
169
142
        ProportionalShape {
142
        ProportionalShape {
170
143
            id: iconShape
143
            id: iconShape
171
144
            anchors.centerIn: parent
144
            anchors.centerIn: parent
173
145
            width: parent.width - units.gu(2)
145
            width: root.itemWidth
174
146
            aspect: UbuntuShape.DropShadow
146
            aspect: UbuntuShape.DropShadow
175
147
            source: Image {
147
            source: Image {
176
148
                id: iconImage
148
                id: iconImage
177
@@ -158,7 +158,8 @@
178
158
            anchors {
158
            anchors {
179
159
                right: parent.right
159
                right: parent.right
180
160
                bottom: parent.bottom
160
                bottom: parent.bottom
182
161
                margins: units.dp(3)
161
                rightMargin: (iconItem.width - root.itemWidth) / 2 - units.dp(2)
183
162
                margins: units.dp(5)
184
162
            }
163
            }
185
163
            width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
164
            width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
186
164
            height: units.gu(2)
165
            height: units.gu(2)
187
@@ -186,16 +187,11 @@
188
186
            id: progressOverlay
187
            id: progressOverlay
189
187
            objectName: "progressOverlay"
188
            objectName: "progressOverlay"
190
188
189
198
189
            anchors {
190
            anchors.centerIn: parent
199
190
                left: iconItem.left
191
            width: root.itemWidth * .8
193
191
                right: iconItem.right
194
192
                verticalCenter: parent.verticalCenter
195
193
                leftMargin: units.gu(1.5)
196
194
                rightMargin: units.gu(1.5)
197
195
            }
200
196
            height: units.gu(1)
192
            height: units.gu(1)
201
197
            visible: root.progress > -1
193
            visible: root.progress > -1
203
198
            color: UbuntuColors.darkGrey
194
            backgroundColor: UbuntuColors.darkGrey
204
199
            borderSource: "none"
195
            borderSource: "none"
205
200
196
206
201
            Item {
197
            Item {
207
@@ -213,7 +209,7 @@
208
213
                        top: parent.top
209
                        top: parent.top
209
214
                        bottom: parent.bottom
210
                        bottom: parent.bottom
210
215
                    }
211
                    }
212
216
                    color: "white"
212
                    backgroundColor: "white"
213
217
                    borderSource: "none"
213
                    borderSource: "none"
214
218
                    width: progressOverlay.width
214
                    width: progressOverlay.width
215
219
                }
215
                }
216
220
216
217
=== modified file 'qml/Launcher/LauncherPanel.qml'
218
--- qml/Launcher/LauncherPanel.qml	2016-02-19 15:10:33 +0000
219
+++ qml/Launcher/LauncherPanel.qml	2016-02-19 15:10:34 +0000
220
@@ -53,14 +53,14 @@
221
53
        if (highlightIndex >= launcherListView.count) {
53
        if (highlightIndex >= launcherListView.count) {
222
54
            highlightIndex = -1;
54
            highlightIndex = -1;
223
55
        }
55
        }
225
56
        moveAnimation.moveToIndex(Math.max(highlightIndex, 0));
56
        launcherListView.moveToIndex(Math.max(highlightIndex, 0));
226
57
    }
57
    }
227
58
    function highlightPrevious() {
58
    function highlightPrevious() {
228
59
        highlightIndex--;
59
        highlightIndex--;
229
60
        if (highlightIndex <= -2) {
60
        if (highlightIndex <= -2) {
230
61
            highlightIndex = launcherListView.count - 1;
61
            highlightIndex = launcherListView.count - 1;
231
62
        }
62
        }
233
63
        moveAnimation.moveToIndex(Math.max(highlightIndex, 0));
63
        launcherListView.moveToIndex(Math.max(highlightIndex, 0));
234
64
    }
64
    }
235
65
    function openQuicklist(index) {
65
    function openQuicklist(index) {
236
66
        quickList.open(index);
66
        quickList.open(index);
237
@@ -83,13 +83,13 @@
238
83
        Rectangle {
83
        Rectangle {
239
84
            objectName: "buttonShowDashHome"
84
            objectName: "buttonShowDashHome"
240
85
            width: parent.width
85
            width: parent.width
242
86
            height: units.gu(7)
86
            height: width * .9
243
87
            color: UbuntuColors.orange
87
            color: UbuntuColors.orange
244
88
            readonly property bool highlighted: root.highlightIndex == -1;
88
            readonly property bool highlighted: root.highlightIndex == -1;
245
89
89
246
90
            Image {
90
            Image {
247
91
                objectName: "dashItem"
91
                objectName: "dashItem"
249
92
                width: units.gu(5)
92
                width: parent.width * .6
250
93
                height: width
93
                height: width
251
94
                anchors.centerIn: parent
94
                anchors.centerIn: parent
252
95
                source: "graphics/home.png"
95
                source: "graphics/home.png"
253
@@ -125,10 +125,8 @@
254
125
                    objectName: "launcherListView"
125
                    objectName: "launcherListView"
255
126
                    anchors {
126
                    anchors {
256
127
                        fill: parent
127
                        fill: parent
261
128
                        topMargin: -extensionSize + units.gu(0.5)
128
                        topMargin: -extensionSize + width * .15
262
129
                        bottomMargin: -extensionSize + units.gu(1)
129
                        bottomMargin: -extensionSize + width * .15
259
130
                        leftMargin: units.gu(0.5)
260
131
                        rightMargin: units.gu(0.5)
263
132
                    }
130
                    }
264
133
                    topMargin: extensionSize
131
                    topMargin: extensionSize
265
134
                    bottomMargin: extensionSize
132
                    bottomMargin: extensionSize
266
@@ -163,11 +161,11 @@
267
163
                    }
161
                    }
268
164
162
269
165
                    // The height of the area where icons start getting folded
163
                    // The height of the area where icons start getting folded
271
166
                    property int foldingStartHeight: units.gu(6.5)
164
                    property int foldingStartHeight: itemHeight
272
167
                    // The height of the area where the items reach the final folding angle
165
                    // The height of the area where the items reach the final folding angle
273
168
                    property int foldingStopHeight: foldingStartHeight - itemHeight - spacing
166
                    property int foldingStopHeight: foldingStartHeight - itemHeight - spacing
276
169
                    property int itemWidth: units.gu(7)
167
                    property int itemWidth: width * .75
277
170
                    property int itemHeight: units.gu(6.5)
168
                    property int itemHeight: itemWidth * 15 / 16 + units.gu(1)
278
171
                    property int clickFlickSpeed: units.gu(60)
169
                    property int clickFlickSpeed: units.gu(60)
279
172
                    property int draggedIndex: dndArea.draggedIndex
170
                    property int draggedIndex: dndArea.draggedIndex
280
173
                    property real realContentY: contentY - originY + topMargin
171
                    property real realContentY: contentY - originY + topMargin
281
@@ -195,22 +193,24 @@
282
195
193
283
196
                    UbuntuNumberAnimation {
194
                    UbuntuNumberAnimation {
284
197
                        id: moveAnimation
195
                        id: moveAnimation
285
196
                        objectName: "moveAnimation"
286
198
                        target: launcherListView
197
                        target: launcherListView
287
199
                        property: "contentY"
198
                        property: "contentY"
288
200
                        function moveTo(contentY) {
199
                        function moveTo(contentY) {
289
201
                            from = launcherListView.contentY;
200
                            from = launcherListView.contentY;
290
202
                            to = contentY;
201
                            to = contentY;
292
203
                            start();
202
                            restart();
293
204
                        }
203
                        }
303
205
                        function moveToIndex(index) {
204
                    }
304
206
                            var itemPosition = index * launcherListView.itemHeight;
205
                    function moveToIndex(index) {
305
207
                            var height = launcherListView.height - launcherListView.topMargin - launcherListView.bottomMargin
206
                        var totalItemHeight = launcherListView.itemHeight + launcherListView.spacing
306
208
                            var distanceToEnd = index == 0 || index == launcherListView.count - 1 ? 0 : launcherListView.itemHeight
207
                        var itemPosition = index * totalItemHeight;
307
209
                            if (itemPosition + launcherListView.itemHeight + distanceToEnd > launcherListView.contentY + launcherListView.topMargin + height) {
208
                        var height = launcherListView.height - launcherListView.topMargin - launcherListView.bottomMargin
308
210
                                moveAnimation.moveTo(itemPosition + launcherListView.itemHeight - launcherListView.topMargin - height + distanceToEnd);
209
                        var distanceToEnd = index == 0 || index == launcherListView.count - 1 ? 0 : totalItemHeight
309
211
                            } else if (itemPosition - distanceToEnd < launcherListView.contentY + launcherListView.topMargin) {
210
                        if (itemPosition + totalItemHeight + distanceToEnd > launcherListView.contentY + launcherListView.originY + launcherListView.topMargin + height) {
310
212
                                moveAnimation.moveTo(itemPosition - distanceToEnd - launcherListView.topMargin);
211
                            moveAnimation.moveTo(itemPosition + launcherListView.itemHeight - launcherListView.topMargin - height + distanceToEnd - launcherListView.originY);
311
213
                            }
212
                        } else if (itemPosition - distanceToEnd < launcherListView.contentY - launcherListView.originY + launcherListView.topMargin) {
312
213
                            moveAnimation.moveTo(itemPosition - distanceToEnd - launcherListView.topMargin + launcherListView.originY);
313
214
                        }
214
                        }
314
215
                    }
215
                    }
315
216
216
316
@@ -228,7 +228,7 @@
317
228
                        itemIndex: index
228
                        itemIndex: index
318
229
                        itemHeight: launcherListView.itemHeight
229
                        itemHeight: launcherListView.itemHeight
319
230
                        itemWidth: launcherListView.itemWidth
230
                        itemWidth: launcherListView.itemWidth
321
231
                        width: itemWidth
231
                        width: parent.width
322
232
                        height: itemHeight
232
                        height: itemHeight
323
233
                        iconName: model.icon
233
                        iconName: model.icon
324
234
                        count: model.count
234
                        count: model.count
325
@@ -277,7 +277,7 @@
326
277
                        onAlertingChanged: {
277
                        onAlertingChanged: {
327
278
                            if(alerting) {
278
                            if(alerting) {
328
279
                                if (!dragging && (launcherListView.peekingIndex === -1 || launcher.visibleWidth > 0)) {
279
                                if (!dragging && (launcherListView.peekingIndex === -1 || launcher.visibleWidth > 0)) {
330
280
                                    moveAnimation.moveToIndex(index)
280
                                    launcherListView.moveToIndex(index)
331
281
                                    if (!dragging && launcher.state !== "visible") {
281
                                    if (!dragging && launcher.state !== "visible") {
332
282
                                        peekingAnimation.start()
282
                                        peekingAnimation.start()
333
283
                                    }
283
                                    }
334
@@ -439,10 +439,8 @@
335
439
439
336
440
                            // First/last item do the scrolling at more than 12 degrees
440
                            // First/last item do the scrolling at more than 12 degrees
337
441
                            if (index == 0 || index == launcherListView.count - 1) {
441
                            if (index == 0 || index == launcherListView.count - 1) {
342
442
                                if (clickedItem.angle > 12) {
442
                                if (clickedItem.angle > 12 || clickedItem.angle < -12) {
343
443
                                    launcherListView.flick(0, -launcherListView.clickFlickSpeed);
443
                                    launcherListView.moveToIndex(index);
340
444
                                } else if (clickedItem.angle < -12) {
341
445
                                    launcherListView.flick(0, launcherListView.clickFlickSpeed);
344
446
                                } else {
444
                                } else {
345
447
                                    root.applicationSelected(LauncherModel.get(index).appId);
445
                                    root.applicationSelected(LauncherModel.get(index).appId);
346
448
                                }
446
                                }
347
@@ -450,10 +448,8 @@
348
450
                            }
448
                            }
349
451
449
350
452
                            // the rest launches apps up to an angle of 30 degrees
450
                            // the rest launches apps up to an angle of 30 degrees
355
453
                            if (clickedItem.angle > 30) {
451
                            if (clickedItem.angle > 30 || clickedItem.angle < -30) {
356
454
                                launcherListView.flick(0, -launcherListView.clickFlickSpeed);
452
                                launcherListView.moveToIndex(index);
353
455
                            } else if (clickedItem.angle < -30) {
354
456
                                launcherListView.flick(0, launcherListView.clickFlickSpeed);
357
457
                            } else {
453
                            } else {
358
458
                                root.applicationSelected(LauncherModel.get(index).appId);
454
                                root.applicationSelected(LauncherModel.get(index).appId);
359
459
                            }
455
                            }
360
@@ -668,7 +664,6 @@
361
668
        onClicked: {
664
        onClicked: {
362
669
            quickList.state = "";
665
            quickList.state = "";
363
670
            quickList.focus = false;
666
            quickList.focus = false;
364
671
            root.highlightIndex = -2;
365
672
            root.kbdNavigationCancelled();
667
            root.kbdNavigationCancelled();
366
673
        }
668
        }
367
674
669
368
@@ -739,16 +734,21 @@
369
739
            case Qt.Key_Left:
734
            case Qt.Key_Left:
370
740
            case Qt.Key_Escape:
735
            case Qt.Key_Escape:
371
741
                quickList.selectedIndex = -1;
736
                quickList.selectedIndex = -1;
373
742
                // Falling through intentionally
737
                quickList.focus = false;
374
738
                quickList.state = ""
375
739
                event.accepted = true;
376
740
                break;
377
743
            case Qt.Key_Enter:
741
            case Qt.Key_Enter:
378
744
            case Qt.Key_Return:
742
            case Qt.Key_Return:
379
745
            case Qt.Key_Space:
743
            case Qt.Key_Space:
380
746
                if (quickList.selectedIndex >= 0) {
744
                if (quickList.selectedIndex >= 0) {
381
747
                    LauncherModel.quickListActionInvoked(quickList.appId, quickList.selectedIndex)
745
                    LauncherModel.quickListActionInvoked(quickList.appId, quickList.selectedIndex)
382
748
                }
746
                }
383
747
                quickList.selectedIndex = -1;
384
749
                quickList.focus = false;
748
                quickList.focus = false;
385
750
                quickList.state = ""
749
                quickList.state = ""
387
751
                // Don't consume the event. We want to close the Launcher too, not just the quicklist.
750
                root.kbdNavigationCancelled();
388
751
                event.accepted = true;
389
752
                break;
752
                break;
390
753
            }
753
            }
391
754
        }
754
        }
392
755
755
393
=== modified file 'qml/Shell.qml'
394
--- qml/Shell.qml	2016-02-19 15:10:33 +0000
395
+++ qml/Shell.qml	2016-02-19 15:10:34 +0000
396
@@ -25,6 +25,7 @@
397
25
import Unity.Connectivity 0.1
25
import Unity.Connectivity 0.1
398
26
import Unity.Launcher 0.1
26
import Unity.Launcher 0.1
399
27
import GlobalShortcut 1.0 // has to be before Utils, because of WindowKeysFilter
27
import GlobalShortcut 1.0 // has to be before Utils, because of WindowKeysFilter
400
28
import GSettings 1.0
401
28
import Utils 0.1
29
import Utils 0.1
402
29
import Powerd 0.1
30
import Powerd 0.1
403
30
import SessionBroadcast 0.1
31
import SessionBroadcast 0.1
404
@@ -187,6 +188,11 @@
405
187
        }
188
        }
406
188
    }
189
    }
407
189
190
408
191
    GSettings {
409
192
        id: settings
410
193
        schema.id: "com.canonical.Unity8"
411
194
    }
412
195
413
190
    Item {
196
    Item {
414
191
        id: stages
197
        id: stages
415
192
        objectName: "stages"
198
        objectName: "stages"
416
@@ -343,6 +349,11 @@
417
343
                property: "altTabPressed"
349
                property: "altTabPressed"
418
344
                value: physicalKeysMapper.altTabPressed
350
                value: physicalKeysMapper.altTabPressed
419
345
            }
351
            }
420
352
            Binding {
421
353
                target: applicationsDisplayLoader.item
422
354
                property: "leftMargin"
423
355
                value: shell.usageScenario == "desktop" && !settings.autohideLauncher ? launcher.panelWidth: 0
424
356
            }
425
346
        }
357
        }
426
347
358
427
348
        Tutorial {
359
        Tutorial {
428
@@ -373,7 +384,11 @@
429
373
    InputMethod {
384
    InputMethod {
430
374
        id: inputMethod
385
        id: inputMethod
431
375
        objectName: "inputMethod"
386
        objectName: "inputMethod"
433
376
        anchors { fill: parent; topMargin: panel.panelHeight }
387
        anchors {
434
388
            fill: parent
435
389
            topMargin: panel.panelHeight
436
390
            leftMargin: launcher.lockedVisible ? launcher.panelWidth : 0
437
391
        }
438
377
        z: notifications.useModal || panel.indicators.shown || wizard.active ? overlay.z + 1 : overlay.z - 1
392
        z: notifications.useModal || panel.indicators.shown || wizard.active ? overlay.z + 1 : overlay.z - 1
439
378
    }
393
    }
440
379
394
441
@@ -559,6 +574,8 @@
442
559
            shadeBackground: !tutorial.running
574
            shadeBackground: !tutorial.running
443
560
            superPressed: physicalKeysMapper.superPressed
575
            superPressed: physicalKeysMapper.superPressed
444
561
            superTabPressed: physicalKeysMapper.superTabPressed
576
            superTabPressed: physicalKeysMapper.superTabPressed
445
577
            panelWidth: units.gu(settings.launcherWidth)
446
578
            lockedVisible: shell.usageScenario == "desktop" && !settings.autohideLauncher && !panel.fullscreenMode
447
562
579
448
563
            onShowDashHome: showHome()
580
            onShowDashHome: showHome()
449
564
            onDash: showDash()
581
            onDash: showDash()
450
565
582
451
=== modified file 'qml/Stages/AbstractStage.qml'
452
--- qml/Stages/AbstractStage.qml	2016-02-19 15:10:33 +0000
453
+++ qml/Stages/AbstractStage.qml	2016-02-19 15:10:34 +0000
454
@@ -42,6 +42,8 @@
455
42
    property int shellOrientationAngle
42
    property int shellOrientationAngle
456
43
    property bool spreadEnabled: true // If false, animations and right edge will be disabled
43
    property bool spreadEnabled: true // If false, animations and right edge will be disabled
457
44
    property bool suspended
44
    property bool suspended
458
45
     // A Stage should paint a wallpaper etc over its full size but not use the margins for window placement
459
46
    property int leftMargin: 0
460
45
47
461
46
    // To be read from outside
48
    // To be read from outside
462
47
    property var mainApp: null
49
    property var mainApp: null
463
48
50
464
=== modified file 'qml/Stages/DesktopStage.qml'
465
--- qml/Stages/DesktopStage.qml	2016-02-19 15:10:33 +0000
466
+++ qml/Stages/DesktopStage.qml	2016-02-19 15:10:34 +0000
467
@@ -226,6 +226,7 @@
468
226
        PanelState.dropShadow = false;
226
        PanelState.dropShadow = false;
469
227
    }
227
    }
470
228
228
471
229
472
229
    FocusScope {
230
    FocusScope {
473
230
        id: appContainer
231
        id: appContainer
474
231
        objectName: "appContainer"
232
        objectName: "appContainer"
475
@@ -297,6 +298,7 @@
476
297
                visible: !visuallyMinimized &&
298
                visible: !visuallyMinimized &&
477
298
                         !greeter.fullyShown &&
299
                         !greeter.fullyShown &&
478
299
                         (priv.foregroundMaximizedAppZ === -1 || priv.foregroundMaximizedAppZ <= z) ||
300
                         (priv.foregroundMaximizedAppZ === -1 || priv.foregroundMaximizedAppZ <= z) ||
479
301
                         decoratedWindow.fullscreen ||
480
300
                         (spread.state == "altTab" && index === spread.highlightedIndex)
302
                         (spread.state == "altTab" && index === spread.highlightedIndex)
481
301
303
482
302
                Binding {
304
                Binding {
483
@@ -368,10 +370,10 @@
484
368
                states: [
370
                states: [
485
369
                    State {
371
                    State {
486
370
                        name: "fullscreen"; when: decoratedWindow.fullscreen
372
                        name: "fullscreen"; when: decoratedWindow.fullscreen
487
371
                        extend: "maximized"
488
372
                        PropertyChanges {
373
                        PropertyChanges {
489
373
                            target: appDelegate;
374
                            target: appDelegate;
491
374
                            y: -PanelState.panelHeight
375
                            x: 0; y: -PanelState.panelHeight
492
376
                            requestedWidth: appContainer.width; requestedHeight: appContainer.height;
493
375
                        }
377
                        }
494
376
                    },
378
                    },
495
377
                    State {
379
                    State {
496
@@ -388,21 +390,21 @@
497
388
                        name: "maximized"; when: appDelegate.maximized && !appDelegate.minimized
390
                        name: "maximized"; when: appDelegate.maximized && !appDelegate.minimized
498
389
                        PropertyChanges {
391
                        PropertyChanges {
499
390
                            target: appDelegate;
392
                            target: appDelegate;
502
391
                            x: 0; y: 0;
393
                            x: root.leftMargin; y: 0;
503
392
                            requestedWidth: root.width; requestedHeight: root.height;
394
                            requestedWidth: appContainer.width - root.leftMargin; requestedHeight: appContainer.height;
504
393
                            visuallyMinimized: false;
395
                            visuallyMinimized: false;
505
394
                            visuallyMaximized: true
396
                            visuallyMaximized: true
506
395
                        }
397
                        }
507
396
                    },
398
                    },
508
397
                    State {
399
                    State {
509
398
                        name: "maximizedLeft"; when: appDelegate.maximizedLeft && !appDelegate.minimized
400
                        name: "maximizedLeft"; when: appDelegate.maximizedLeft && !appDelegate.minimized
512
399
                        PropertyChanges { target: appDelegate; x: 0; y: PanelState.panelHeight;
401
                        PropertyChanges { target: appDelegate; x: root.leftMargin; y: PanelState.panelHeight;
513
400
                            requestedWidth: root.width/2; requestedHeight: root.height - PanelState.panelHeight }
402
                            requestedWidth: (appContainer.width - root.leftMargin)/2; requestedHeight: appContainer.height - PanelState.panelHeight }
514
401
                    },
403
                    },
515
402
                    State {
404
                    State {
516
403
                        name: "maximizedRight"; when: appDelegate.maximizedRight && !appDelegate.minimized
405
                        name: "maximizedRight"; when: appDelegate.maximizedRight && !appDelegate.minimized
519
404
                        PropertyChanges { target: appDelegate; x: root.width/2; y: PanelState.panelHeight;
406
                        PropertyChanges { target: appDelegate; x: (appContainer.width + root.leftMargin)/2; y: PanelState.panelHeight;
520
405
                            requestedWidth: root.width/2; requestedHeight: root.height - PanelState.panelHeight }
407
                            requestedWidth: (appContainer.width - root.leftMargin)/2; requestedHeight: appContainer.height - PanelState.panelHeight }
521
406
                    },
408
                    },
522
407
                    State {
409
                    State {
523
408
                        name: "minimized"; when: appDelegate.minimized
410
                        name: "minimized"; when: appDelegate.minimized
524
@@ -465,8 +467,9 @@
525
465
                    minHeight: units.gu(10)
467
                    minHeight: units.gu(10)
526
466
                    borderThickness: units.gu(2)
468
                    borderThickness: units.gu(2)
527
467
                    windowId: model.appId // FIXME: Change this to point to windowId once we have such a thing
469
                    windowId: model.appId // FIXME: Change this to point to windowId once we have such a thing
530
468
                    screenWidth: root.width
470
                    screenWidth: appContainer.width
531
469
                    screenHeight: root.height
471
                    screenHeight: appContainer.height
532
472
                    leftMargin: root.leftMargin
533
470
473
534
471
                    onPressed: { ApplicationManager.focusApplication(model.appId) }
474
                    onPressed: { ApplicationManager.focusApplication(model.appId) }
535
472
                }
475
                }
536
@@ -523,7 +526,7 @@
537
523
    DesktopSpread {
526
    DesktopSpread {
538
524
        id: spread
527
        id: spread
539
525
        objectName: "spread"
528
        objectName: "spread"
541
526
        anchors.fill: parent
529
        anchors.fill: appContainer
542
527
        workspace: appContainer
530
        workspace: appContainer
543
528
        focus: state == "altTab"
531
        focus: state == "altTab"
544
529
        altTabPressed: root.altTabPressed
532
        altTabPressed: root.altTabPressed
545
530
533
546
=== modified file 'qml/Stages/WindowResizeArea.qml'
547
--- qml/Stages/WindowResizeArea.qml	2016-02-03 14:00:47 +0000
548
+++ qml/Stages/WindowResizeArea.qml	2016-02-19 15:10:34 +0000
549
@@ -40,6 +40,7 @@
550
40
    property int defaultHeight: units.gu(50)
40
    property int defaultHeight: units.gu(50)
551
41
    property int screenWidth: 0
41
    property int screenWidth: 0
552
42
    property int screenHeight: 0
42
    property int screenHeight: 0
553
43
    property int leftMargin: 0
554
43
44
555
44
    QtObject {
45
    QtObject {
556
45
        id: priv
46
        id: priv
557
@@ -72,9 +73,9 @@
558
72
        var windowGeometry = windowStateStorage.getGeometry(root.windowId,
73
        var windowGeometry = windowStateStorage.getGeometry(root.windowId,
559
73
                                                            Qt.rect(target.x, target.y, defaultWidth, defaultHeight));
74
                                                            Qt.rect(target.x, target.y, defaultWidth, defaultHeight));
560
74
75
562
75
        target.requestedWidth = Math.min(Math.max(windowGeometry.width, d.minimumWidth), screenWidth);
76
        target.requestedWidth = Math.min(Math.max(windowGeometry.width, d.minimumWidth), screenWidth - root.leftMargin);
563
76
        target.requestedHeight = Math.min(Math.max(windowGeometry.height, d.minimumHeight), root.screenHeight - PanelState.panelHeight);
77
        target.requestedHeight = Math.min(Math.max(windowGeometry.height, d.minimumHeight), root.screenHeight - PanelState.panelHeight);
565
77
        target.x = Math.max(Math.min(windowGeometry.x, root.screenWidth - target.requestedWidth), 0)
78
        target.x = Math.max(Math.min(windowGeometry.x, root.screenWidth - root.leftMargin - target.requestedWidth), root.leftMargin)
566
78
        target.y = Math.max(Math.min(windowGeometry.y, root.screenHeight - target.requestedHeight), PanelState.panelHeight)
79
        target.y = Math.max(Math.min(windowGeometry.y, root.screenHeight - target.requestedHeight), PanelState.panelHeight)
567
79
80
568
80
        var windowState = windowStateStorage.getState(root.windowId, WindowStateStorage.WindowStateNormal)
81
        var windowState = windowStateStorage.getState(root.windowId, WindowStateStorage.WindowStateNormal)
569
81
82
570
=== modified file 'tests/mocks/GSettings.1.0/fake_gsettings.cpp'
571
--- tests/mocks/GSettings.1.0/fake_gsettings.cpp	2015-09-29 20:19:56 +0000
572
+++ tests/mocks/GSettings.1.0/fake_gsettings.cpp	2016-02-19 15:10:34 +0000
573
@@ -22,6 +22,8 @@
574
22
22
575
23
GSettingsControllerQml::GSettingsControllerQml()
23
GSettingsControllerQml::GSettingsControllerQml()
576
24
    : m_usageMode("Staged")
24
    : m_usageMode("Staged")
577
25
    , m_autohideLauncher(false)
578
26
    , m_launcherWidth(8)
579
25
{
27
{
580
26
}
28
}
581
27
29
582
@@ -88,6 +90,32 @@
583
88
    }
90
    }
584
89
}
91
}
585
90
92
586
93
bool GSettingsControllerQml::autohideLauncher() const
587
94
{
588
95
    return m_autohideLauncher;
589
96
}
590
97
591
98
void GSettingsControllerQml::setAutohideLauncher(bool autohideLauncher)
592
99
{
593
100
    if (m_autohideLauncher != autohideLauncher) {
594
101
        m_autohideLauncher = autohideLauncher;
595
102
        Q_EMIT autohideLauncherChanged(autohideLauncher);
596
103
    }
597
104
}
598
105
599
106
int GSettingsControllerQml::launcherWidth() const
600
107
{
601
108
    return m_launcherWidth;
602
109
}
603
110
604
111
void GSettingsControllerQml::setLauncherWidth(int launcherWidth)
605
112
{
606
113
    if (m_launcherWidth != launcherWidth) {
607
114
        m_launcherWidth = launcherWidth;
608
115
        Q_EMIT launcherWidthChanged(launcherWidth);
609
116
    }
610
117
}
611
118
612
91
GSettingsSchemaQml::GSettingsSchemaQml(QObject *parent): QObject(parent) {
119
GSettingsSchemaQml::GSettingsSchemaQml(QObject *parent): QObject(parent) {
613
92
}
120
}
614
93
121
615
@@ -129,6 +157,10 @@
616
129
            this, &GSettingsQml::lockedOutTimeChanged);
157
            this, &GSettingsQml::lockedOutTimeChanged);
617
130
    connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::lifecycleExemptAppidsChanged,
158
    connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::lifecycleExemptAppidsChanged,
618
131
            this, &GSettingsQml::lifecycleExemptAppidsChanged);
159
            this, &GSettingsQml::lifecycleExemptAppidsChanged);
619
160
    connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::autohideLauncherChanged,
620
161
            this, &GSettingsQml::autohideLauncherChanged);
621
162
    connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::launcherWidthChanged,
622
163
            this, &GSettingsQml::launcherWidthChanged);
623
132
}
164
}
624
133
165
625
134
GSettingsSchemaQml * GSettingsQml::schema() const {
166
GSettingsSchemaQml * GSettingsQml::schema() const {
626
@@ -192,9 +224,41 @@
627
192
    }
224
    }
628
193
}
225
}
629
194
226
630
227
bool GSettingsQml::autohideLauncher() const
631
228
{
632
229
    if (m_schema->id() == "com.canonical.Unity8") {
633
230
        return GSettingsControllerQml::instance()->autohideLauncher();
634
231
    } else {
635
232
        return false;
636
233
    }
637
234
}
638
235
639
236
int GSettingsQml::launcherWidth() const
640
237
{
641
238
    if (m_schema->id() == "com.canonical.Unity8") {
642
239
        return GSettingsControllerQml::instance()->launcherWidth();
643
240
    } else {
644
241
        return false;
645
242
    }
646
243
}
647
244
648
195
void GSettingsQml::setLifecycleExemptAppids(const QStringList &appIds)
245
void GSettingsQml::setLifecycleExemptAppids(const QStringList &appIds)
649
196
{
246
{
650
197
    if (m_schema->id() == "com.canonical.qtmir") {
247
    if (m_schema->id() == "com.canonical.qtmir") {
651
198
        GSettingsControllerQml::instance()->setLifecycleExemptAppids(appIds);
248
        GSettingsControllerQml::instance()->setLifecycleExemptAppids(appIds);
652
199
    }
249
    }
653
200
}
250
}
654
251
655
252
void GSettingsQml::setAutohideLauncher(bool autohideLauncher)
656
253
{
657
254
    if (m_schema->id() == "com.canonical.Unity8") {
658
255
        GSettingsControllerQml::instance()->setAutohideLauncher(autohideLauncher);
659
256
    }
660
257
}
661
258
662
259
void GSettingsQml::setLauncherWidth(int launcherWidth)
663
260
{
664
261
    if (m_schema->id() == "com.canonical.Unity8") {
665
262
        GSettingsControllerQml::instance()->setLauncherWidth(launcherWidth);
666
263
    }
667
264
}
668
201
265
669
=== modified file 'tests/mocks/GSettings.1.0/fake_gsettings.h'
670
--- tests/mocks/GSettings.1.0/fake_gsettings.h	2015-09-29 20:19:56 +0000
671
+++ tests/mocks/GSettings.1.0/fake_gsettings.h	2016-02-19 15:10:34 +0000
672
@@ -50,6 +50,8 @@
673
50
    Q_PROPERTY(QString usageMode READ usageMode WRITE setUsageMode NOTIFY usageModeChanged)
50
    Q_PROPERTY(QString usageMode READ usageMode WRITE setUsageMode NOTIFY usageModeChanged)
674
51
    Q_PROPERTY(qint64 lockedOutTime READ lockedOutTime WRITE setLockedOutTime NOTIFY lockedOutTimeChanged)
51
    Q_PROPERTY(qint64 lockedOutTime READ lockedOutTime WRITE setLockedOutTime NOTIFY lockedOutTimeChanged)
675
52
    Q_PROPERTY(QStringList lifecycleExemptAppids READ lifecycleExemptAppids WRITE setLifecycleExemptAppids NOTIFY lifecycleExemptAppidsChanged)
52
    Q_PROPERTY(QStringList lifecycleExemptAppids READ lifecycleExemptAppids WRITE setLifecycleExemptAppids NOTIFY lifecycleExemptAppidsChanged)
676
53
    Q_PROPERTY(bool autohideLauncher READ autohideLauncher WRITE setAutohideLauncher NOTIFY autohideLauncherChanged)
677
54
    Q_PROPERTY(int launcherWidth READ launcherWidth WRITE setLauncherWidth NOTIFY launcherWidthChanged)
678
53
55
679
54
public:
56
public:
680
55
    GSettingsQml(QObject *parent = nullptr);
57
    GSettingsQml(QObject *parent = nullptr);
681
@@ -59,11 +61,15 @@
682
59
    QString usageMode() const;
61
    QString usageMode() const;
683
60
    qint64 lockedOutTime() const;
62
    qint64 lockedOutTime() const;
684
61
    QStringList lifecycleExemptAppids() const;
63
    QStringList lifecycleExemptAppids() const;
685
64
    bool autohideLauncher() const;
686
65
    int launcherWidth() const;
687
62
66
688
63
    void setPictureUri(const QString &str);
67
    void setPictureUri(const QString &str);
689
64
    void setUsageMode(const QString &usageMode);
68
    void setUsageMode(const QString &usageMode);
690
65
    void setLockedOutTime(qint64 timestamp);
69
    void setLockedOutTime(qint64 timestamp);
691
66
    void setLifecycleExemptAppids(const QStringList &appIds);
70
    void setLifecycleExemptAppids(const QStringList &appIds);
692
71
    void setAutohideLauncher(bool autohideLauncher);
693
72
    void setLauncherWidth(int launcherWidth);
694
67
73
695
68
Q_SIGNALS:
74
Q_SIGNALS:
696
69
    void schemaChanged();
75
    void schemaChanged();
697
@@ -71,6 +77,8 @@
698
71
    void usageModeChanged(const QString&);
77
    void usageModeChanged(const QString&);
699
72
    void lockedOutTimeChanged(qint64);
78
    void lockedOutTimeChanged(qint64);
700
73
    void lifecycleExemptAppidsChanged(const QStringList &);
79
    void lifecycleExemptAppidsChanged(const QStringList &);
701
80
    void autohideLauncherChanged(bool);
702
81
    void launcherWidthChanged(int launcherWidth);
703
74
82
704
75
private:
83
private:
705
76
    GSettingsSchemaQml* m_schema;
84
    GSettingsSchemaQml* m_schema;
706
@@ -98,11 +106,19 @@
707
98
    QStringList lifecycleExemptAppids() const;
106
    QStringList lifecycleExemptAppids() const;
708
99
    Q_INVOKABLE void setLifecycleExemptAppids(const QStringList &appIds);
107
    Q_INVOKABLE void setLifecycleExemptAppids(const QStringList &appIds);
709
100
108
710
109
    bool autohideLauncher() const;
711
110
    Q_INVOKABLE void setAutohideLauncher(bool autohideLauncher);
712
111
713
112
    int launcherWidth() const;
714
113
    Q_INVOKABLE void setLauncherWidth(int launcherWidth);
715
114
716
101
Q_SIGNALS:
115
Q_SIGNALS:
717
102
    void pictureUriChanged(const QString&);
116
    void pictureUriChanged(const QString&);
718
103
    void usageModeChanged(const QString&);
117
    void usageModeChanged(const QString&);
719
104
    void lockedOutTimeChanged(qint64 timestamp);
118
    void lockedOutTimeChanged(qint64 timestamp);
720
105
    void lifecycleExemptAppidsChanged(const QStringList&);
119
    void lifecycleExemptAppidsChanged(const QStringList&);
721
120
    void autohideLauncherChanged(bool autohideLauncher);
722
121
    void launcherWidthChanged(int launcherWidth);
723
106
122
724
107
private:
123
private:
725
108
    GSettingsControllerQml();
124
    GSettingsControllerQml();
726
@@ -111,6 +127,8 @@
727
111
    QString m_usageMode;
127
    QString m_usageMode;
728
112
    qint64 m_lockedOutTime;
128
    qint64 m_lockedOutTime;
729
113
    QStringList m_lifecycleExemptAppids;
129
    QStringList m_lifecycleExemptAppids;
730
130
    bool m_autohideLauncher;
731
131
    int m_launcherWidth;
732
114
132
733
115
    static GSettingsControllerQml* s_controllerInstance;
133
    static GSettingsControllerQml* s_controllerInstance;
734
116
    QList<GSettingsQml *> m_registeredGSettings;
134
    QList<GSettingsQml *> m_registeredGSettings;
735
117
135
736
=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
737
--- tests/qmltests/Launcher/tst_Launcher.qml	2016-02-19 15:10:33 +0000
738
+++ tests/qmltests/Launcher/tst_Launcher.qml	2016-02-19 15:10:34 +0000
739
@@ -28,8 +28,8 @@
740
28
   launcher. */
28
   launcher. */
741
29
Item {
29
Item {
742
30
    id: root
30
    id: root
745
31
    width: units.gu(50)
31
    width: units.gu(140)
746
32
    height: units.gu(55)
32
    height: units.gu(70)
747
33
33
748
34
    Loader {
34
    Loader {
749
35
        id: launcherLoader
35
        id: launcherLoader
750
@@ -79,11 +79,40 @@
751
79
        }
79
        }
752
80
    }
80
    }
753
81
81
754
82
    Binding {
755
83
        target: launcherLoader.item
756
84
        property: "lockedVisible"
757
85
        value: lockedVisibleCheckBox.checked
758
86
    }
759
87
    Binding {
760
88
        target: launcherLoader.item
761
89
        property: "panelWidth"
762
90
        value: units.gu(Math.round(widthSlider.value))
763
91
    }
764
92
765
82
    ColumnLayout {
93
    ColumnLayout {
766
83
        anchors { bottom: parent.bottom; right: parent.right; margins: units.gu(1) }
94
        anchors { bottom: parent.bottom; right: parent.right; margins: units.gu(1) }
767
84
        spacing: units.gu(1)
95
        spacing: units.gu(1)
768
85
        width: childrenRect.width
96
        width: childrenRect.width
769
86
97
770
98
        RowLayout {
771
99
            CheckBox {
772
100
                id: lockedVisibleCheckBox
773
101
                checked: false
774
102
            }
775
103
            Label {
776
104
                text: "Launcher always visible"
777
105
            }
778
106
        }
779
107
780
108
        Slider {
781
109
            id: widthSlider
782
110
            Layout.fillWidth: true
783
111
            minimumValue: 6
784
112
            maximumValue: 12
785
113
            value: 10
786
114
        }
787
115
788
87
        MouseTouchEmulationCheckbox {}
116
        MouseTouchEmulationCheckbox {}
789
88
117
790
89
        EdgeBarrierControls {
118
        EdgeBarrierControls {
791
@@ -217,10 +246,6 @@
792
217
            // growing while populating it with icons etc.
246
            // growing while populating it with icons etc.
793
218
            tryCompare(listView, "flicking", false);
247
            tryCompare(listView, "flicking", false);
794
219
248
795
220
            // Make sure noone changed the height of the window. The issue this test case
796
221
            // is verifying only happens on certain heights of the Launcher
797
222
            compare(root.height, units.gu(55));
798
223
799
224
            compare(listView.contentY, -listView.topMargin, "Launcher did not start up with first item unfolded");
249
            compare(listView.contentY, -listView.topMargin, "Launcher did not start up with first item unfolded");
800
225
250
801
226
            // Now do check that snapping is in fact enabled
251
            // Now do check that snapping is in fact enabled
802
@@ -277,14 +302,21 @@
803
277
302
804
278
        function positionLauncherListAtBeginning() {
303
        function positionLauncherListAtBeginning() {
805
279
            var listView = testCase.findChild(launcherLoader.item, "launcherListView");
304
            var listView = testCase.findChild(launcherLoader.item, "launcherListView");
807
280
            listView.contentY = -listView.topMargin;
305
            var moveAnimation = findInvisibleChild(listView, "moveAnimation")
808
306
809
307
            listView.moveToIndex(0);
810
308
811
309
            waitForRendering(listView);
812
310
            tryCompare(moveAnimation, "running", false);
813
281
        }
311
        }
814
282
        function positionLauncherListAtEnd() {
312
        function positionLauncherListAtEnd() {
815
283
            var listView = testCase.findChild(launcherLoader.item, "launcherListView");
313
            var listView = testCase.findChild(launcherLoader.item, "launcherListView");
820
284
            if ((listView.contentHeight + listView.topMargin + listView.bottomMargin) > listView.height) {
314
            var moveAnimation = findInvisibleChild(listView, "moveAnimation")
821
285
                listView.contentY = listView.topMargin + listView.contentHeight
315
822
286
                    - listView.height;
316
            listView.moveToIndex(listView.count -1);
823
287
            }
317
824
318
            waitForRendering(listView);
825
319
            tryCompare(moveAnimation, "running", false);
826
288
        }
320
        }
827
289
321
828
290
        function assertFocusOnIndex(index) {
322
        function assertFocusOnIndex(index) {
829
@@ -292,10 +324,10 @@
830
292
            var bfbFocusHighlight = findChild(launcher, "bfbFocusHighlight");
324
            var bfbFocusHighlight = findChild(launcher, "bfbFocusHighlight");
831
293
325
832
294
            waitForRendering(launcher);
326
            waitForRendering(launcher);
834
295
            tryCompare(bfbFocusHighlight, "visible", index === -1);
327
            compare(bfbFocusHighlight.visible, index === -1);
835
296
            for (var i = 0; i < launcherListView.count; i++) {
328
            for (var i = 0; i < launcherListView.count; i++) {
836
297
                var focusRing = findChild(findChild(launcher, "launcherDelegate" + i), "focusRing")
329
                var focusRing = findChild(findChild(launcher, "launcherDelegate" + i), "focusRing")
838
298
                tryCompare(focusRing, "visible", index === i);
330
                compare(focusRing.visible, index === i);
839
299
            }
331
            }
840
300
        }
332
        }
841
301
333
842
@@ -400,6 +432,7 @@
843
400
                wait(100)
432
                wait(100)
844
401
                compare(launcher.maxPanelX, -launcher.panelWidth, "Launcher moved even if it shouldn't")
433
                compare(launcher.maxPanelX, -launcher.panelWidth, "Launcher moved even if it shouldn't")
845
402
            }
434
            }
846
435
847
403
            waitUntilLauncherDisappears();
436
            waitUntilLauncherDisappears();
848
404
            launcher.available = true;
437
            launcher.available = true;
849
405
        }
438
        }
850
@@ -423,6 +456,8 @@
851
423
            dragLauncherIntoView();
456
            dragLauncherIntoView();
852
424
            var launcherListView = findChild(launcher, "launcherListView");
457
            var launcherListView = findChild(launcher, "launcherListView");
853
425
            for (var i = 0; i < launcherListView.count; ++i) {
458
            for (var i = 0; i < launcherListView.count; ++i) {
854
459
                launcherListView.moveToIndex(i);
855
460
                waitForRendering(launcherListView);
856
426
                var delegate = findChild(launcherListView, "launcherDelegate" + i)
461
                var delegate = findChild(launcherListView, "launcherDelegate" + i)
857
427
                compare(findChild(delegate, "countEmblem").visible, LauncherModel.get(i).countVisible)
462
                compare(findChild(delegate, "countEmblem").visible, LauncherModel.get(i).countVisible)
858
428
                // Intentionally allow type coercion (string/number)
463
                // Intentionally allow type coercion (string/number)
859
@@ -483,6 +518,7 @@
860
483
            launcher.lastSelectedApplication = "";
518
            launcher.lastSelectedApplication = "";
861
484
            dragLauncherIntoView();
519
            dragLauncherIntoView();
862
485
            var listView = findChild(launcher, "launcherListView");
520
            var listView = findChild(launcher, "launcherListView");
863
521
            var moveAnimation = findInvisibleChild(listView, "moveAnimation")
864
486
522
865
487
            // flicking is unreliable. sometimes it works, sometimes the
523
            // flicking is unreliable. sometimes it works, sometimes the
866
488
            // list view moves just a tiny bit or not at all, making tests fail.
524
            // list view moves just a tiny bit or not at all, making tests fail.
867
@@ -493,12 +529,14 @@
868
493
            } else {
529
            } else {
869
494
                positionLauncherListAtEnd();
530
                positionLauncherListAtEnd();
870
495
            }
531
            }
871
496
            tryCompare(listView, "flicking", false);
872
497
873
498
            var oldY = listView.contentY;
532
            var oldY = listView.contentY;
874
499
533
875
500
            mouseClick(listView, listView.width / 2, data.clickY);
534
            mouseClick(listView, listView.width / 2, data.clickY);
877
501
            tryCompare(listView, "flicking", false);
535
878
536
            if (data.expectFlick) {
879
537
                tryCompare(moveAnimation, "running", true);
880
538
            }
881
539
            tryCompare(moveAnimation, "running", false);
882
502
540
883
503
            if (data.expectFlick) {
541
            if (data.expectFlick) {
884
504
                verify(listView.contentY != oldY);
542
                verify(listView.contentY != oldY);
885
@@ -1086,12 +1124,15 @@
886
1086
        function test_keyboardNavigation() {
1124
        function test_keyboardNavigation() {
887
1087
            var bfbFocusHighlight = findChild(launcher, "bfbFocusHighlight");
1125
            var bfbFocusHighlight = findChild(launcher, "bfbFocusHighlight");
888
1088
            var quickList = findChild(launcher, "quickList");
1126
            var quickList = findChild(launcher, "quickList");
889
1127
            var launcherPanel = findChild(launcher, "launcherPanel");
890
1089
            var launcherListView = findChild(launcher, "launcherListView");
1128
            var launcherListView = findChild(launcher, "launcherListView");
891
1090
            var last = launcherListView.count - 1;
1129
            var last = launcherListView.count - 1;
892
1091
1130
893
1092
            compare(bfbFocusHighlight.visible, false);
1131
            compare(bfbFocusHighlight.visible, false);
894
1093
1132
895
1094
            launcher.openForKeyboardNavigation();
1133
            launcher.openForKeyboardNavigation();
896
1134
            tryCompare(launcherPanel, "x", 0);
897
1135
            waitForRendering(launcher);
898
1095
1136
899
1096
            assertFocusOnIndex(-1);
1137
            assertFocusOnIndex(-1);
900
1097
1138
901
@@ -1164,11 +1205,47 @@
902
1164
            compare(signalSpy.count, 1, "Quicklist signal wasn't triggered")
1205
            compare(signalSpy.count, 1, "Quicklist signal wasn't triggered")
903
1165
            compare(signalSpy.signalArguments[0][0], LauncherModel.get(1).appId)
1206
            compare(signalSpy.signalArguments[0][0], LauncherModel.get(1).appId)
904
1166
            compare(signalSpy.signalArguments[0][1], 2)
1207
            compare(signalSpy.signalArguments[0][1], 2)
908
1167
        }
1208
            assertFocusOnIndex(-2);
909
1168
1209
        }
910
1169
        function test_cancelKbdNavigationWitMouse() {
1210
911
1211
        function test_hideNotWorkingWhenLockedOut_data() {
912
1212
            return [
913
1213
                {tag: "locked visible", locked: true},
914
1214
                {tag: "no locked visible", locked: false},
915
1215
            ]
916
1216
        }
917
1217
918
1218
        function test_hideNotWorkingWhenLockedOut(data) {
919
1219
            launcher.lockedVisible = data.locked;
920
1220
            if (data.locked) {
921
1221
                tryCompare(launcher, "state", "visible");
922
1222
            } else {
923
1223
                tryCompare(launcher, "state", "");
924
1224
            }
925
1225
926
1226
            launcher.hide();
927
1227
            waitForRendering(launcher);
928
1228
            if (data.locked) {
929
1229
                verify(launcher.state == "visible");
930
1230
            } else {
931
1231
                verify(launcher.state == "");
932
1232
            }
933
1233
        }
934
1234
935
1235
        function test_cancelKbdNavigationWitMouse_data() {
936
1236
            return [
937
1237
                        {tag: "locked out - no quicklist", autohide: false, withQuickList: false },
938
1238
                        {tag: "locked out - with quicklist", autohide: false, withQuickList: true },
939
1239
                        {tag: "autohide - no quicklist", autohide: true, withQuickList: false },
940
1240
                        {tag: "autohide - with quicklist", autohide: true, withQuickList: true },
941
1241
            ]
942
1242
        }
943
1243
944
1244
        function test_cancelKbdNavigationWitMouse(data) {
945
1245
            launcher.autohideEnabled = data.autohide;
946
1170
            launcher.openForKeyboardNavigation();
1246
            launcher.openForKeyboardNavigation();
947
1171
            waitForRendering(launcher);
1247
            waitForRendering(launcher);
948
1248
949
1172
            var launcherPanel = findChild(launcher, "launcherPanel");
1249
            var launcherPanel = findChild(launcher, "launcherPanel");
950
1173
            tryCompare(launcherPanel, "x", 0);
1250
            tryCompare(launcherPanel, "x", 0);
951
1174
1251
952
@@ -1176,15 +1253,22 @@
953
1176
1253
954
1177
            keyClick(Qt.Key_Down); // Down to launcher item 0
1254
            keyClick(Qt.Key_Down); // Down to launcher item 0
955
1178
            keyClick(Qt.Key_Down); // Down to launcher item 1
1255
            keyClick(Qt.Key_Down); // Down to launcher item 1
956
1179
            keyClick(Qt.Key_Right); // Into quicklist
957
1180
1256
958
1257
            if (data.withQuickList) {
959
1258
                keyClick(Qt.Key_Right); // Into quicklist
960
1259
                tryCompare(quickList, "visible", true)
961
1260
            }
962
1181
            waitForRendering(launcher)
1261
            waitForRendering(launcher)
969
1182
            tryCompare(quickList, "visible", true)
1262
970
1183
1263
            mouseClick(root);
971
1184
            mouseClick(root, root.width / 2, units.gu(2));
1264
972
1185
1265
            if (data.autohide) {
973
1186
            tryCompare(launcher, "state", "");
1266
                tryCompare(launcher, "state", "");
974
1187
            tryCompare(launcherPanel, "highlightIndex", -2);
1267
            } else {
975
1268
                tryCompare(launcher, "state", "visible");
976
1269
            }
977
1270
978
1271
            assertFocusOnIndex(-2);
979
1188
        }
1272
        }
980
1189
    }
1273
    }
981
1190
}
1274
}
982
1191
1275
983
=== modified file 'tests/qmltests/tst_Shell.qml'
984
--- tests/qmltests/tst_Shell.qml	2016-02-19 15:10:33 +0000
985
+++ tests/qmltests/tst_Shell.qml	2016-02-19 15:10:34 +0000
986
@@ -223,6 +223,19 @@
987
223
                    }
223
                    }
988
224
                }
224
                }
989
225
225
990
226
                Row {
991
227
                    anchors { left: parent.left; right: parent.right }
992
228
                    CheckBox {
993
229
                        id: autohideLauncherCheckbox
994
230
                        onCheckedChanged:  {
995
231
                            GSettingsController.setAutohideLauncher(checked)
996
232
                        }
997
233
                    }
998
234
                    Label {
999
235
                        text: "Autohide launcher"
1000
236
                    }
1001
237
                }
1002
238
1003
226
                Label { text: "Applications"; font.bold: true }
239
                Label { text: "Applications"; font.bold: true }
1004
227
240
1005
228
                Button {
241
                Button {
1006
@@ -921,6 +934,7 @@
1007
921
        function dragLauncherIntoView() {
934
        function dragLauncherIntoView() {
1008
922
            var launcher = findChild(shell, "launcher");
935
            var launcher = findChild(shell, "launcher");
1009
923
            var launcherPanel = findChild(launcher, "launcherPanel");
936
            var launcherPanel = findChild(launcher, "launcherPanel");
1010
937
            waitForRendering(launcher);
1011
924
            verify(launcherPanel.x = - launcherPanel.width);
938
            verify(launcherPanel.x = - launcherPanel.width);
1012
925
939
1013
926
            var touchStartX = 2;
940
            var touchStartX = 2;
1014
@@ -1678,7 +1692,7 @@
1015
1678
            var x = 0;
1692
            var x = 0;
1016
1679
            var y = shell.height * .5
1693
            var y = shell.height * .5
1017
1680
            mouseMove(shell, x, y)
1694
            mouseMove(shell, x, y)
1019
1681
            while (x <= spreadFlickable.width) {
1695
            while (x <= shell.width) {
1020
1682
                x+=10;
1696
                x+=10;
1021
1683
                mouseMove(shell, x, y)
1697
                mouseMove(shell, x, y)
1022
1684
                wait(0); // spin the loop so bindings get evaluated
1698
                wait(0); // spin the loop so bindings get evaluated
1023
@@ -1752,25 +1766,38 @@
1024
1752
            keyRelease(Qt.Key_Alt);
1766
            keyRelease(Qt.Key_Alt);
1025
1753
        }
1767
        }
1026
1754
1768
1028
1755
        function test_focusAppFromLauncherExitsSpread() {
1769
        function test_focusAppFromLauncherExitsSpread_data() {
1029
1770
            return [
1030
1771
                {tag: "autohide launcher", launcherLocked: false },
1031
1772
                {tag: "locked launcher", launcherLocked: true }
1032
1773
            ]
1033
1774
        }
1034
1775
1035
1776
        function test_focusAppFromLauncherExitsSpread(data) {
1036
1756
            loadDesktopShellWithApps()
1777
            loadDesktopShellWithApps()
1038
1757
1778
            var launcher = findChild(shell, "launcher");
1039
1758
            var desktopSpread = findChild(shell, "spread");
1779
            var desktopSpread = findChild(shell, "spread");
1040
1759
            var launcher = findChild(shell, "launcher");
1041
1760
            var bfb = findChild(launcher, "buttonShowDashHome");
1780
            var bfb = findChild(launcher, "buttonShowDashHome");
1042
1761
1781
1043
1782
            GSettingsController.setAutohideLauncher(!data.launcherLocked);
1044
1783
            waitForRendering(shell);
1045
1784
1046
1762
            keyPress(Qt.Key_Alt)
1785
            keyPress(Qt.Key_Alt)
1047
1763
            keyClick(Qt.Key_Tab);
1786
            keyClick(Qt.Key_Tab);
1048
1764
1787
1049
1765
            tryCompare(desktopSpread, "state", "altTab")
1788
            tryCompare(desktopSpread, "state", "altTab")
1050
1766
1789
1055
1767
            revealLauncherByEdgePushWithMouse();
1790
            if (!data.launcherLocked) {
1056
1768
            tryCompare(launcher, "x", 0);
1791
                revealLauncherByEdgePushWithMouse();
1057
1769
            mouseMove(bfb, bfb.width / 2, bfb.height / 2)
1792
                tryCompare(launcher, "x", 0);
1058
1770
            waitForRendering(shell)
1793
                mouseMove(bfb, bfb.width / 2, bfb.height / 2)
1059
1794
                waitForRendering(shell)
1060
1795
            }
1061
1771
1796
1062
1772
            mouseClick(bfb, bfb.width / 2, bfb.height / 2)
1797
            mouseClick(bfb, bfb.width / 2, bfb.height / 2)
1064
1773
            tryCompare(launcher, "state", "")
1798
            if (!data.launcherLocked) {
1065
1799
                tryCompare(launcher, "state", "")
1066
1800
            }
1067
1774
            tryCompare(desktopSpread, "state", "")
1801
            tryCompare(desktopSpread, "state", "")
1068
1775
1802
1069
1776
            tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash")
1803
            tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash")
1070
@@ -1998,16 +2025,24 @@
1071
1998
            }
2025
            }
1072
1999
        }
2026
        }
1073
2000
2027
1075
2001
        function test_superTabToCycleLauncher() {
2028
        function test_superTabToCycleLauncher_data() {
1076
2029
            return [
1077
2030
                {tag: "autohide launcher", launcherLocked: false},
1078
2031
                {tag: "locked launcher", launcherLocked: true}
1079
2032
            ]
1080
2033
        }
1081
2034
1082
2035
        function test_superTabToCycleLauncher(data) {
1083
2002
            loadShell("desktop");
2036
            loadShell("desktop");
1084
2003
            shell.usageScenario = "desktop";
2037
            shell.usageScenario = "desktop";
1085
2038
            GSettingsController.setAutohideLauncher(!data.launcherLocked);
1086
2004
            waitForRendering(shell);
2039
            waitForRendering(shell);
1087
2005
2040
1088
2006
            var launcher = findChild(shell, "launcher");
2041
            var launcher = findChild(shell, "launcher");
1089
2007
            var launcherPanel = findChild(launcher, "launcherPanel");
2042
            var launcherPanel = findChild(launcher, "launcherPanel");
1090
2008
            var firstAppInLauncher = LauncherModel.get(0).appId;
2043
            var firstAppInLauncher = LauncherModel.get(0).appId;
1091
2009
2044
1093
2010
            compare(launcher.state, "");
2045
            compare(launcher.state, data.launcherLocked ? "visible": "");
1094
2011
            compare(launcherPanel.highlightIndex, -2);
2046
            compare(launcherPanel.highlightIndex, -2);
1095
2012
            compare(ApplicationManager.focusedApplicationId, "unity8-dash");
2047
            compare(ApplicationManager.focusedApplicationId, "unity8-dash");
1096
2013
2048
1097
@@ -2019,7 +2054,7 @@
1098
2019
            keyClick(Qt.Key_Tab);
2054
            keyClick(Qt.Key_Tab);
1099
2020
            tryCompare(launcherPanel, "highlightIndex", 0);
2055
            tryCompare(launcherPanel, "highlightIndex", 0);
1100
2021
            keyRelease(Qt.Key_Super_L, Qt.MetaModifier);
2056
            keyRelease(Qt.Key_Super_L, Qt.MetaModifier);
1102
2022
            tryCompare(launcher, "state", "");
2057
            tryCompare(launcher, "state", data.launcherLocked ? "visible" : "");
1103
2023
            tryCompare(launcherPanel, "highlightIndex", -2);
2058
            tryCompare(launcherPanel, "highlightIndex", -2);
1104
2024
            tryCompare(ApplicationManager, "focusedApplicationId", firstAppInLauncher);
2059
            tryCompare(ApplicationManager, "focusedApplicationId", firstAppInLauncher);
1105
2025
2060
1106
@@ -2029,7 +2064,7 @@
1107
2029
            tryCompare(launcher, "state", "visible");
2064
            tryCompare(launcher, "state", "visible");
1108
2030
            tryCompare(launcherPanel, "highlightIndex", -1);
2065
            tryCompare(launcherPanel, "highlightIndex", -1);
1109
2031
            keyRelease(Qt.Key_Super_L, Qt.MetaModifier);
2066
            keyRelease(Qt.Key_Super_L, Qt.MetaModifier);
1111
2032
            tryCompare(launcher, "state", "");
2067
            tryCompare(launcher, "state", data.launcherLocked ? "visible" : "");
1112
2033
            tryCompare(launcherPanel, "highlightIndex", -2);
2068
            tryCompare(launcherPanel, "highlightIndex", -2);
1113
2034
            tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
2069
            tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
1114
2035
        }
2070
        }
1115
@@ -2078,6 +2113,49 @@
1116
2078
            tryCompare(launcher, "focus", true)
2113
            tryCompare(launcher, "focus", true)
1117
2079
        }
2114
        }
1118
2080
2115
1119
2116
        function test_lockedOutLauncherAddsMarginsToMaximized() {
1120
2117
            loadShell("desktop");
1121
2118
            shell.usageScenario = "desktop";
1122
2119
            waitForRendering(shell);
1123
2120
            var appContainer = findChild(shell, "appContainer");
1124
2121
            var launcher = findChild(shell, "launcher");
1125
2122
1126
2123
            var app = ApplicationManager.startApplication("music-app");
1127
2124
            waitUntilAppWindowIsFullyLoaded(app);
1128
2125
            var appDelegate = findChild(appContainer, "appDelegate_music-app");
1129
2126
            appDelegate.maximize();
1130
2127
            tryCompare(appDelegate, "visuallyMaximized", true);
1131
2128
            waitForRendering(shell);
1132
2129
1133
2130
            GSettingsController.setAutohideLauncher(true);
1134
2131
            waitForRendering(shell)
1135
2132
            var hiddenSize = appDelegate.width;
1136
2133
1137
2134
            GSettingsController.setAutohideLauncher(false);
1138
2135
            waitForRendering(shell)
1139
2136
            var shownSize = appDelegate.width;
1140
2137
1141
2138
            compare(shownSize + launcher.panelWidth, hiddenSize);
1142
2139
        }
1143
2140
1144
2141
        function test_fullscreenAppHidesLockedOutLauncher() {
1145
2142
            loadShell("desktop");
1146
2143
            shell.usageScenario = "desktop";
1147
2144
1148
2145
            var launcher = findChild(shell, "launcher");
1149
2146
            var launcherPanel = findChild(launcher, "launcherPanel");
1150
2147
1151
2148
            GSettingsController.setAutohideLauncher(false);
1152
2149
            waitForRendering(shell)
1153
2150
1154
2151
            tryCompare(launcher, "lockedVisible", true);
1155
2152
1156
2153
            var cameraApp = ApplicationManager.startApplication("camera-app");
1157
2154
            waitUntilAppWindowIsFullyLoaded(cameraApp);
1158
2155
1159
2156
            tryCompare(launcher, "lockedVisible", false);
1160
2157
        }
1161
2158
1162
2081
        function test_inputEventsOnEdgesEndUpInAppSurface_data() {
2159
        function test_inputEventsOnEdgesEndUpInAppSurface_data() {
1163
2082
            return [
2160
            return [
1164
2083
                { tag: "phone", repeaterName: "spreadRepeater" },
2161
                { tag: "phone", repeaterName: "spreadRepeater" },
Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2016-02-17	Approve on 2016-02-22
Albert Astals Cid (community)		2016-02-17	Abstain on 2016-02-22
PS Jenkins bot (community)	continuous-integration	2016-02-17	Needs Fixing on 2016-02-19
Unity8 CI Bot	continuous-integration	2016-02-17	Needs Fixing on 2016-02-19
Michael Terry		2016-02-17	Pending
Michał Sawicz			Pending
Daniel d'Andrada		2016-02-17	Pending
Review via email: mp+286396@code.launchpad.net