1
=== modified file 'qml/Stages/PhoneStage.qml'
2
--- qml/Stages/PhoneStage.qml	2016-01-14 13:03:20 +0000
3
+++ qml/Stages/PhoneStage.qml	2016-03-10 11:59:10 +0000
4
@@ -74,6 +74,12 @@
5
74
        }
74
        }
6
75
    }
75
    }
7
76
76
8
77
    function pushRightEdge(amount) {
9
78
        if (spreadView.contentX == -spreadView.shift) {
10
79
            edgeBarrier.push(amount);
11
80
        }
12
81
    }
13
82
14
77
    mainApp: applicationManager.focusedApplicationId
83
    mainApp: applicationManager.focusedApplicationId
15
78
            ? applicationManager.findApplication(applicationManager.focusedApplicationId)
84
            ? applicationManager.findApplication(applicationManager.focusedApplicationId)
16
79
            : null
85
            : null
17
@@ -651,4 +657,31 @@
18
651
            }
657
            }
19
652
        }
658
        }
20
653
    }
659
    }
21
660
22
661
    EdgeBarrier {
23
662
        id: edgeBarrier
24
663
25
664
        // NB: it does its own positioning according to the specified edge
26
665
        edge: Qt.RightEdge
27
666
28
667
        onPassed: {
29
668
            // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
30
669
            snapAnimation.targetContentX = (root.width * spreadView.positionMarker4) + 1 - spreadView.shift;
31
670
            snapAnimation.start();
32
671
        }
33
672
        material: Component {
34
673
            Item {
35
674
                Rectangle {
36
675
                    width: parent.height
37
676
                    height: parent.width
38
677
                    rotation: 90
39
678
                    anchors.centerIn: parent
40
679
                    gradient: Gradient {
41
680
                        GradientStop { position: 0.0; color: Qt.rgba(0.16,0.16,0.16,0.7)}
42
681
                        GradientStop { position: 1.0; color: Qt.rgba(0.16,0.16,0.16,0)}
43
682
                    }
44
683
                }
45
684
            }
46
685
        }
47
686
    }
48
654
}
687
}
49
655
688
50
=== modified file 'qml/Stages/TabletStage.qml'
51
--- qml/Stages/TabletStage.qml	2016-01-14 13:03:20 +0000
52
+++ qml/Stages/TabletStage.qml	2016-03-10 11:59:10 +0000
53
@@ -70,6 +70,12 @@
54
70
        }
70
        }
55
71
    }
71
    }
56
72
72
57
73
    function pushRightEdge(amount) {
58
74
        if (spreadView.contentX == -spreadView.shift) {
59
75
            edgeBarrier.push(amount);
60
76
        }
61
77
    }
62
78
63
73
    orientationChangesEnabled: priv.mainAppOrientationChangesEnabled
79
    orientationChangesEnabled: priv.mainAppOrientationChangesEnabled
64
74
80
65
75
    supportedOrientations: mainApp ? mainApp.supportedOrientations
81
    supportedOrientations: mainApp ? mainApp.supportedOrientations
66
@@ -805,4 +811,31 @@
67
805
            }
811
            }
68
806
        }
812
        }
69
807
    }
813
    }
70
814
71
815
    EdgeBarrier {
72
816
        id: edgeBarrier
73
817
74
818
        // NB: it does its own positioning according to the specified edge
75
819
        edge: Qt.RightEdge
76
820
77
821
        onPassed: {
78
822
            // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
79
823
            snapAnimation.targetContentX = (root.width * spreadView.positionMarker4) + 1 - spreadView.shift;
80
824
            snapAnimation.start();
81
825
        }
82
826
        material: Component {
83
827
            Item {
84
828
                Rectangle {
85
829
                    width: parent.height
86
830
                    height: parent.width
87
831
                    rotation: 90
88
832
                    anchors.centerIn: parent
89
833
                    gradient: Gradient {
90
834
                        GradientStop { position: 0.0; color: Qt.rgba(0.16,0.16,0.16,0.7)}
91
835
                        GradientStop { position: 1.0; color: Qt.rgba(0.16,0.16,0.16,0)}
92
836
                    }
93
837
                }
94
838
            }
95
839
        }
96
840
    }
97
808
}
841
}
98
809
842
99
=== modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
100
--- tests/qmltests/Stages/tst_PhoneStage.qml	2015-11-25 13:33:42 +0000
101
+++ tests/qmltests/Stages/tst_PhoneStage.qml	2016-03-10 11:59:10 +0000
102
@@ -40,12 +40,6 @@
103
40
        orientations: Orientations {}
40
        orientations: Orientations {}
104
41
    }
41
    }
105
42
42
106
43
    Binding {
107
44
        target: ApplicationManager
108
45
        property: "rightMargin"
109
46
        value: phoneStage.anchors.rightMargin
110
47
    }
111
48
112
49
    Rectangle {
43
    Rectangle {
113
50
        anchors { fill: parent; leftMargin: phoneStage.width }
44
        anchors { fill: parent; leftMargin: phoneStage.width }
114
51
45
115
@@ -77,6 +71,15 @@
116
77
                    ApplicationManager.get(appList.selectedAppIndex).setState(ApplicationInfoInterface.Stopped);
71
                    ApplicationManager.get(appList.selectedAppIndex).setState(ApplicationInfoInterface.Stopped);
117
78
                }
72
                }
118
79
            }
73
            }
119
74
            EdgeBarrierControls {
120
75
                id: edgeBarrierControls
121
76
                text: "Drag here to pull out spread"
122
77
                backgroundColor: "blue"
123
78
                onDragged: { phoneStage.pushRightEdge(amount); }
124
79
                Component.onCompleted: {
125
80
                    edgeBarrierControls.target = testCase.findChild(phoneStage, "edgeBarrierController");
126
81
                }
127
82
            }
128
80
        }
83
        }
129
81
        ListView {
84
        ListView {
130
82
            id: appList
85
            id: appList
131
@@ -463,5 +466,15 @@
132
463
466
133
464
            tryCompare(delegate.application, "requestedState", ApplicationInfoInterface.RequestedRunning);
467
            tryCompare(delegate.application, "requestedState", ApplicationInfoInterface.RequestedRunning);
134
465
        }
468
        }
135
469
136
470
        function test_mouseEdgePush() {
137
471
            var spreadView = findChild(phoneStage, "spreadView")
138
472
            addApps(1);
139
473
            mouseMove(phoneStage, phoneStage.width -  1, units.gu(10));
140
474
            for (var i = 0; i < units.gu(10); i++) {
141
475
                phoneStage.pushRightEdge(1);
142
476
            }
143
477
            tryCompare(spreadView, "phase", 2);
144
478
        }
145
466
    }
479
    }
146
467
}
480
}
147
468
481
148
=== modified file 'tests/qmltests/Stages/tst_TabletStage.qml'
149
--- tests/qmltests/Stages/tst_TabletStage.qml	2015-12-01 12:17:24 +0000
150
+++ tests/qmltests/Stages/tst_TabletStage.qml	2016-03-10 11:59:10 +0000
151
@@ -21,6 +21,7 @@
152
21
import Unity.Application 0.1
21
import Unity.Application 0.1
153
22
import Unity.Test 0.1
22
import Unity.Test 0.1
154
23
23
155
24
import ".."
156
24
import "../../../qml/Stages"
25
import "../../../qml/Stages"
157
25
import "../../../qml/Components"
26
import "../../../qml/Components"
158
26
27
159
@@ -77,6 +78,15 @@
160
77
        Column {
78
        Column {
161
78
            anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
79
            anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
162
79
            spacing: units.gu(1)
80
            spacing: units.gu(1)
163
81
            EdgeBarrierControls {
164
82
                id: edgeBarrierControls
165
83
                text: "Drag here to pull out spread"
166
84
                backgroundColor: "blue"
167
85
                onDragged: { tabletStageLoader.item.pushRightEdge(amount); }
168
86
                Component.onCompleted: {
169
87
                    edgeBarrierControls.target = testCase.findChild(tabletStageLoader, "edgeBarrierController");
170
88
                }
171
89
            }
172
80
            ApplicationCheckBox {
90
            ApplicationCheckBox {
173
81
                id: webbrowserCheckBox
91
                id: webbrowserCheckBox
174
82
                appId: "webbrowser-app"
92
                appId: "webbrowser-app"
175
@@ -365,6 +375,14 @@
176
365
            tryCompare(webbrowserApp, "requestedState", ApplicationInfoInterface.RequestedRunning);
375
            tryCompare(webbrowserApp, "requestedState", ApplicationInfoInterface.RequestedRunning);
177
366
            tryCompare(dialerApp, "requestedState", ApplicationInfoInterface.RequestedRunning);
376
            tryCompare(dialerApp, "requestedState", ApplicationInfoInterface.RequestedRunning);
178
367
        }
377
        }
179
378
180
379
        function test_mouseEdgePush() {
181
380
            var spreadView = findChild(tabletStageLoader, "spreadView")
182
381
            mouseMove(tabletStageLoader, tabletStageLoader.width -  1, units.gu(10));
183
382
            for (var i = 0; i < units.gu(10); i++) {
184
383
                tabletStageLoader.item.pushRightEdge(1);
185
384
            }
186
385
            tryCompare(spreadView, "phase", 2);
187
386
        }
188
368
    }
387
    }
189
369
190
370
}
388
}
Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)			Approve on 2016-03-10
Unity8 CI Bot	continuous-integration	2016-03-10	Pending
PS Jenkins bot	continuous-integration	2016-03-10	Pending
Josh Arenson		2016-03-10	Pending
Review via email: mp+288628@code.launchpad.net
1	=== modified file 'qml/Stages/PhoneStage.qml'
2	--- qml/Stages/PhoneStage.qml 2016-01-14 13:03:20 +0000
3	+++ qml/Stages/PhoneStage.qml 2016-03-10 11:59:10 +0000
4	@@ -74,6 +74,12 @@
5	74	}	74	}
6	75	}	75	}
7	76		76
8			77	function pushRightEdge(amount) {
9			78	if (spreadView.contentX == -spreadView.shift) {
10			79	edgeBarrier.push(amount);
11			80	}
12			81	}
13			82
14	77	mainApp: applicationManager.focusedApplicationId	83	mainApp: applicationManager.focusedApplicationId
15	78	? applicationManager.findApplication(applicationManager.focusedApplicationId)	84	? applicationManager.findApplication(applicationManager.focusedApplicationId)
16	79	: null	85	: null
17	@@ -651,4 +657,31 @@
18	651	}	657	}
19	652	}	658	}
20	653	}	659	}
21			660
22			661	EdgeBarrier {
23			662	id: edgeBarrier
24			663
25			664	// NB: it does its own positioning according to the specified edge
26			665	edge: Qt.RightEdge
27			666
28			667	onPassed: {
29			668	// Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
30			669	snapAnimation.targetContentX = (root.width * spreadView.positionMarker4) + 1 - spreadView.shift;
31			670	snapAnimation.start();
32			671	}
33			672	material: Component {
34			673	Item {
35			674	Rectangle {
36			675	width: parent.height
37			676	height: parent.width
38			677	rotation: 90
39			678	anchors.centerIn: parent
40			679	gradient: Gradient {
41			680	GradientStop { position: 0.0; color: Qt.rgba(0.16,0.16,0.16,0.7)}
42			681	GradientStop { position: 1.0; color: Qt.rgba(0.16,0.16,0.16,0)}
43			682	}
44			683	}
45			684	}
46			685	}
47			686	}
48	654	}	687	}
49	655		688
50	=== modified file 'qml/Stages/TabletStage.qml'
51	--- qml/Stages/TabletStage.qml 2016-01-14 13:03:20 +0000
52	+++ qml/Stages/TabletStage.qml 2016-03-10 11:59:10 +0000
53	@@ -70,6 +70,12 @@
54	70	}	70	}
55	71	}	71	}
56	72		72
57			73	function pushRightEdge(amount) {
58			74	if (spreadView.contentX == -spreadView.shift) {
59			75	edgeBarrier.push(amount);
60			76	}
61			77	}
62			78
63	73	orientationChangesEnabled: priv.mainAppOrientationChangesEnabled	79	orientationChangesEnabled: priv.mainAppOrientationChangesEnabled
64	74		80
65	75	supportedOrientations: mainApp ? mainApp.supportedOrientations	81	supportedOrientations: mainApp ? mainApp.supportedOrientations
66	@@ -805,4 +811,31 @@
67	805	}	811	}
68	806	}	812	}
69	807	}	813	}
70			814
71			815	EdgeBarrier {
72			816	id: edgeBarrier
73			817
74			818	// NB: it does its own positioning according to the specified edge
75			819	edge: Qt.RightEdge
76			820
77			821	onPassed: {
78			822	// Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
79			823	snapAnimation.targetContentX = (root.width * spreadView.positionMarker4) + 1 - spreadView.shift;
80			824	snapAnimation.start();
81			825	}
82			826	material: Component {
83			827	Item {
84			828	Rectangle {
85			829	width: parent.height
86			830	height: parent.width
87			831	rotation: 90
88			832	anchors.centerIn: parent
89			833	gradient: Gradient {
90			834	GradientStop { position: 0.0; color: Qt.rgba(0.16,0.16,0.16,0.7)}
91			835	GradientStop { position: 1.0; color: Qt.rgba(0.16,0.16,0.16,0)}
92			836	}
93			837	}
94			838	}
95			839	}
96			840	}
97	808	}	841	}
98	809		842
99	=== modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
100	--- tests/qmltests/Stages/tst_PhoneStage.qml 2015-11-25 13:33:42 +0000
101	+++ tests/qmltests/Stages/tst_PhoneStage.qml 2016-03-10 11:59:10 +0000
102	@@ -40,12 +40,6 @@
103	40	orientations: Orientations {}	40	orientations: Orientations {}
104	41	}	41	}
105	42		42
106	43	Binding {
107	44	target: ApplicationManager
108	45	property: "rightMargin"
109	46	value: phoneStage.anchors.rightMargin
110	47	}
111	48
112	49	Rectangle {	43	Rectangle {
113	50	anchors { fill: parent; leftMargin: phoneStage.width }	44	anchors { fill: parent; leftMargin: phoneStage.width }
114	51		45
115	@@ -77,6 +71,15 @@
116	77	ApplicationManager.get(appList.selectedAppIndex).setState(ApplicationInfoInterface.Stopped);	71	ApplicationManager.get(appList.selectedAppIndex).setState(ApplicationInfoInterface.Stopped);
117	78	}	72	}
118	79	}	73	}
119			74	EdgeBarrierControls {
120			75	id: edgeBarrierControls
121			76	text: "Drag here to pull out spread"
122			77	backgroundColor: "blue"
123			78	onDragged: { phoneStage.pushRightEdge(amount); }
124			79	Component.onCompleted: {
125			80	edgeBarrierControls.target = testCase.findChild(phoneStage, "edgeBarrierController");
126			81	}
127			82	}
128	80	}	83	}
129	81	ListView {	84	ListView {
130	82	id: appList	85	id: appList
131	@@ -463,5 +466,15 @@
132	463		466
133	464	tryCompare(delegate.application, "requestedState", ApplicationInfoInterface.RequestedRunning);	467	tryCompare(delegate.application, "requestedState", ApplicationInfoInterface.RequestedRunning);
134	465	}	468	}
135			469
136			470	function test_mouseEdgePush() {
137			471	var spreadView = findChild(phoneStage, "spreadView")
138			472	addApps(1);
139			473	mouseMove(phoneStage, phoneStage.width - 1, units.gu(10));
140			474	for (var i = 0; i < units.gu(10); i++) {
141			475	phoneStage.pushRightEdge(1);
142			476	}
143			477	tryCompare(spreadView, "phase", 2);
144			478	}
145	466	}	479	}
146	467	}	480	}
147	468		481
148	=== modified file 'tests/qmltests/Stages/tst_TabletStage.qml'
149	--- tests/qmltests/Stages/tst_TabletStage.qml 2015-12-01 12:17:24 +0000
150	+++ tests/qmltests/Stages/tst_TabletStage.qml 2016-03-10 11:59:10 +0000
151	@@ -21,6 +21,7 @@
152	21	import Unity.Application 0.1	21	import Unity.Application 0.1
153	22	import Unity.Test 0.1	22	import Unity.Test 0.1
154	23		23
155			24	import ".."
156	24	import "../../../qml/Stages"	25	import "../../../qml/Stages"
157	25	import "../../../qml/Components"	26	import "../../../qml/Components"
158	26		27
159	@@ -77,6 +78,15 @@
160	77	Column {	78	Column {
161	78	anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }	79	anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
162	79	spacing: units.gu(1)	80	spacing: units.gu(1)
163			81	EdgeBarrierControls {
164			82	id: edgeBarrierControls
165			83	text: "Drag here to pull out spread"
166			84	backgroundColor: "blue"
167			85	onDragged: { tabletStageLoader.item.pushRightEdge(amount); }
168			86	Component.onCompleted: {
169			87	edgeBarrierControls.target = testCase.findChild(tabletStageLoader, "edgeBarrierController");
170			88	}
171			89	}
172	80	ApplicationCheckBox {	90	ApplicationCheckBox {
173	81	id: webbrowserCheckBox	91	id: webbrowserCheckBox
174	82	appId: "webbrowser-app"	92	appId: "webbrowser-app"
175	@@ -365,6 +375,14 @@
176	365	tryCompare(webbrowserApp, "requestedState", ApplicationInfoInterface.RequestedRunning);	375	tryCompare(webbrowserApp, "requestedState", ApplicationInfoInterface.RequestedRunning);
177	366	tryCompare(dialerApp, "requestedState", ApplicationInfoInterface.RequestedRunning);	376	tryCompare(dialerApp, "requestedState", ApplicationInfoInterface.RequestedRunning);
178	367	}	377	}
179			378
180			379	function test_mouseEdgePush() {
181			380	var spreadView = findChild(tabletStageLoader, "spreadView")
182			381	mouseMove(tabletStageLoader, tabletStageLoader.width - 1, units.gu(10));
183			382	for (var i = 0; i < units.gu(10); i++) {
184			383	tabletStageLoader.item.pushRightEdge(1);
185			384	}
186			385	tryCompare(spreadView, "phase", 2);
187			386	}
188	368	}	387	}
189	369
190	370	}	388	}