git.iko.soy/unity8
on xenial help sign in
add a test for updating the usage mode if the screen size changes
0ddf010Michael Zanetti
qml/OrientedShell.qml+1−1
compare with xenial
unifiedsplit
@@ -105,7 +105,7 @@ Item {
105 if (unity8Settings.usageMode === undefined)
105 if (unity8Settings.usageMode === undefined)
106 return; // gsettings isn't loaded yet, we'll try again in Component.onCompleted
106 return; // gsettings isn't loaded yet, we'll try again in Component.onCompleted
107
107
108− console.log("Pointer input devices changed:", pointerInputDevices, "current mode:", unity8Settings.usageMode, "old device count", miceModel.oldCount + touchPadModel.oldCount, "root width:", root.width / units.gu(1), "height:", root.height / units.gu(1))
108+ console.log("Calculating new usage mode. Pointer devices:", pointerInputDevices, "current mode:", unity8Settings.usageMode, "old device count", miceModel.oldCount + touchPadModel.oldCount, "root width:", root.width / units.gu(1), "height:", root.height / units.gu(1))
109 if (unity8Settings.usageMode === "Windowed") {
109 if (unity8Settings.usageMode === "Windowed") {
110 if (Math.min(root.width, root.height) > units.gu(60)) {
110 if (Math.min(root.width, root.height) > units.gu(60)) {
111 if (pointerInputDevices === 0) {
111 if (pointerInputDevices === 0) {
tests/qmltests/tst_OrientedShell.qml+20
@@ -1142,6 +1142,26 @@ Rectangle {
1142 orientedShellLoader.width = oldWidth;
1142 orientedShellLoader.width = oldWidth;
1143 }
1143 }
1144
1144
1145+ function test_screenSizeChanges() {
1146+ loadShell("mako")
1147+ var shell = findChild(orientedShell, "shell");
1148+
1149+ tryCompare(shell, "usageScenario", "phone");
1150+
1151+ // make screen larger
1152+ orientedShellLoader.width = units.gu(90);
1153+ tryCompare(shell, "usageScenario", "phone");
1154+
1155+ // plug a mouse
1156+ MockInputDeviceBackend.addMockDevice("/mouse0", InputInfo.Mouse);
1157+ tryCompare(shell, "usageScenario", "desktop");
1158+
1159+ // make the screen smaller again, it should go back to staged even though there's still a mouse around
1160+ orientedShellLoader.width = units.gu(40);
1161+
1162+ tryCompare(shell, "usageScenario", "phone");
1163+ }
1164+
1145 function test_overrideStaged() {
1165 function test_overrideStaged() {
1146 loadShell("mako")
1166 loadShell("mako")
1147
1167