git.iko.soy/unity8
on xenial help sign in
Untie usage mode from form factor and properly test stage switch
7014b78Daniel d'Andrada
qml/Stages/TabletStage.qml+2
compare with xenial
unifiedsplit
@@ -493,6 +493,8 @@ Rectangle {
493
493
494 delegate: TransformedTabletSpreadDelegate {
494 delegate: TransformedTabletSpreadDelegate {
495 id: spreadTile
495 id: spreadTile
496+ objectName: model.appId ? "tabletSpreadDelegate_" + model.appId
497+ : "tabletSpreadDelegate_null";
496 height: spreadView.height
498 height: spreadView.height
497 width: model.stage == ApplicationInfoInterface.MainStage ? spreadView.width : spreadView.sideStageWidth
499 width: model.stage == ApplicationInfoInterface.MainStage ? spreadView.width : spreadView.sideStageWidth
498 active: model.appId == priv.mainStageAppId || model.appId == priv.sideStageAppId
500 active: model.appId == priv.mainStageAppId || model.appId == priv.sideStageAppId
tests/qmltests/tst_Shell.qml+48−55
@@ -85,11 +85,6 @@ Rectangle {
85 width: units.gu(40)
85 width: units.gu(40)
86 height: units.gu(71)
86 height: units.gu(71)
87 }
87 }
88− StateChangeScript {
89− script: {
90− GSettingsController.setUsageMode("Staged")
91− }
92− }
93 },
88 },
94 State {
89 State {
95 name: "tablet"
90 name: "tablet"
@@ -98,28 +93,6 @@ Rectangle {
98 width: units.gu(100)
93 width: units.gu(100)
99 height: units.gu(71)
94 height: units.gu(71)
100 }
95 }
101− StateChangeScript {
102− script: {
103− GSettingsController.setUsageMode("Staged")
104− }
105− }
106− },
107− State {
108− name: "desktop"
109− PropertyChanges {
110− target: shellLoader
111− width: units.gu(100)
112− height: units.gu(71)
113− }
114− PropertyChanges {
115− target: mouseEmulation
116− checked: false
117− }
118− StateChangeScript {
119− script: {
120− GSettingsController.setUsageMode("Windowed")
121− }
122− }
123 }
96 }
124 ]
97 ]
125
98
@@ -185,13 +158,23 @@ Rectangle {
185 anchors { left: parent.left; right: parent.right }
158 anchors { left: parent.left; right: parent.right }
186 activeFocusOnPress: false
159 activeFocusOnPress: false
187 text: "Size"
160 text: "Size"
188− model: ["phone", "tablet", "desktop"]
161+ model: ["phone", "tablet"]
189 onSelectedIndexChanged: {
162 onSelectedIndexChanged: {
190 shellLoader.active = false;
163 shellLoader.active = false;
191 shellLoader.state = model[selectedIndex];
164 shellLoader.state = model[selectedIndex];
192 shellLoader.active = true;
165 shellLoader.active = true;
193 }
166 }
194 }
167 }
168+ ListItem.ItemSelector {
169+ id: usageModeSelector
170+ anchors { left: parent.left; right: parent.right }
171+ activeFocusOnPress: false
172+ text: "Usage mode"
173+ model: ["Staged", "Windowed"]
174+ onSelectedIndexChanged: {
175+ GSettingsController.setUsageMode(model[selectedIndex]);
176+ }
177+ }
195 MouseTouchEmulationCheckbox {
178 MouseTouchEmulationCheckbox {
196 id: mouseEmulation
179 id: mouseEmulation
197 checked: true
180 checked: true
@@ -287,6 +270,7 @@ Rectangle {
287 function cleanup() {
270 function cleanup() {
288 tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
271 tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
289 tearDown();
272 tearDown();
273+ GSettingsController.setUsageMode("Staged");
290 }
274 }
291
275
292 function loadShell(formFactor) {
276 function loadShell(formFactor) {
@@ -733,13 +717,14 @@ Rectangle {
733
717
734 function test_launchedAppHasActiveFocus_data() {
718 function test_launchedAppHasActiveFocus_data() {
735 return [
719 return [
736− {tag: "phone", formFactor: "phone"},
720+ {tag: "phone", formFactor: "phone", usageMode: "Staged"},
737− {tag: "tablet", formFactor: "tablet"},
721+ {tag: "tablet", formFactor: "tablet", usageMode: "Staged"},
738− {tag: "desktop", formFactor: "desktop"}
722+ {tag: "desktop", formFactor: "tablet", usageMode: "Windowed"}
739− ];
723+ ]
740 }
724 }
741
725
742 function test_launchedAppHasActiveFocus(data) {
726 function test_launchedAppHasActiveFocus(data) {
727+ GSettingsController.setUsageMode(data.usageMode);
743 loadShell(data.formFactor);
728 loadShell(data.formFactor);
744 swipeAwayGreeter();
729 swipeAwayGreeter();
745
730
@@ -752,19 +737,8 @@ Rectangle {
752 tryCompare(webApp.session.surface, "activeFocus", true);
737 tryCompare(webApp.session.surface, "activeFocus", true);
753 }
738 }
754
739
755− function test_launchedAppHasActiveFocusWhenFormFactorSwitched_data() {
740+ function test_launchedAppKeepsActiveFocusOnUsageModeChange() {
756− return [
757− {tag: "phone->tablet", from: "phone", to: "tablet"},
758− {tag: "phone->desktop", from: "phone", to: "desktop"},
759− {tag: "tablet->phone", from: "tablet", to: "phone"},
760− {tag: "tablet->desktop", from: "tablet", to: "desktop"},
761− {tag: "desktop->phone", from: "desktop", to: "phone"},
762− {tag: "desktop->tablet", from: "desktop", to: "tablet"},
763− ];
764− }
765−
766− function test_launchedAppHasActiveFocusWhenFormFactorSwitched(data) {
767− loadShell(data.from);
741+ loadShell("tablet");
768 swipeAwayGreeter();
742 swipeAwayGreeter();
769
743
770 var webApp = ApplicationManager.startApplication("webbrowser-app");
744 var webApp = ApplicationManager.startApplication("webbrowser-app");
@@ -775,7 +749,24 @@ Rectangle {
775
749
776 tryCompare(webApp.session.surface, "activeFocus", true);
750 tryCompare(webApp.session.surface, "activeFocus", true);
777
751
778− loadShell(data.to);
752+ GSettingsController.setUsageMode("Windowed");
753+
754+ // check that the desktop stage and window have been loaded
755+ {
756+ var desktopWindow = findChild(shell, "decoratedWindow_webbrowser-app");
757+ verify(desktopWindow);
758+ }
759+
760+ tryCompare(webApp.session.surface, "activeFocus", true);
761+
762+ GSettingsController.setUsageMode("Staged");
763+
764+ // check that the tablet stage and app surface delegate have been loaded
765+ {
766+ var desktopWindow = findChild(shell, "tabletSpreadDelegate_webbrowser-app");
767+ verify(desktopWindow);
768+ }
769+
779 tryCompare(webApp.session.surface, "activeFocus", true);
770 tryCompare(webApp.session.surface, "activeFocus", true);
780 }
771 }
781
772
@@ -1262,31 +1253,33 @@ Rectangle {
1262
1253
1263 function test_stageLoader_data() {
1254 function test_stageLoader_data() {
1264 return [
1255 return [
1265− {tag: "phone", source: "Stages/PhoneStage.qml"},
1256+ {tag: "phone", source: "Stages/PhoneStage.qml", formFactor: "phone", usageMode: "Staged"},
1266− {tag: "tablet", source: "Stages/TabletStage.qml"},
1257+ {tag: "tablet", source: "Stages/TabletStage.qml", formFactor: "tablet", usageMode: "Staged"},
1267− {tag: "desktop", source: "Stages/DesktopStage.qml"}
1258+ {tag: "desktop", source: "Stages/DesktopStage.qml", formFactor: "tablet", usageMode: "Windowed"}
1268 ]
1259 ]
1269 }
1260 }
1270
1261
1271 function test_stageLoader(data) {
1262 function test_stageLoader(data) {
1263+ GSettingsController.setUsageMode(data.usageMode);
1272− loadShell(data.tag);
1264+ loadShell(data.formFactor);
1273 var stageLoader = findChild(shell, "applicationsDisplayLoader");
1265 var stageLoader = findChild(shell, "applicationsDisplayLoader");
1274 verify(String(stageLoader.source).indexOf(data.source) >= 0);
1266 verify(String(stageLoader.source).indexOf(data.source) >= 0);
1275 }
1267 }
1276
1268
1277 function test_launcherInverted_data() {
1269 function test_launcherInverted_data() {
1278 return [
1270 return [
1279− {tag: "phone", formFactor: "phone"},
1271+ {tag: "phone", formFactor: "phone", usageMode: "Staged", launcherInverted: true},
1280− {tag: "tablet", formFactor: "tablet"},
1272+ {tag: "tablet", formFactor: "tablet", usageMode: "Staged", launcherInverted: true},
1281− {tag: "desktop", formFactor: "desktop"}
1273+ {tag: "desktop", formFactor: "tablet", usageMode: "Windowed", launcherInverted: false}
1282− ];
1274+ ]
1283 }
1275 }
1284
1276
1285 function test_launcherInverted(data) {
1277 function test_launcherInverted(data) {
1278+ GSettingsController.setUsageMode(data.usageMode);
1286 loadShell(data.formFactor);
1279 loadShell(data.formFactor);
1287
1280
1288 var launcher = findChild(shell, "launcher");
1281 var launcher = findChild(shell, "launcher");
1289− compare(launcher.inverted, data.formFactor !== "desktop");
1282+ compare(launcher.inverted, data.launcherInverted);
1290 }
1283 }
1291 }
1284 }
1292}
1285}