git.iko.soy/unity8
on xenial help sign in
make big tablets switch to windowed mode even with only a kbd attached
462d983Michael Zanetti
qml/OrientedShell.qml+13−4
compare with xenial
unifiedsplit
@@ -202,11 +202,20 @@ Rectangle {
202 return "tablet";
202 return "tablet";
203 }
203 }
204 } else { // automatic
204 } else { // automatic
205+ var longEdgeWidth = Math.max(root.width, root.height)
206+ print("Automatic mode:", longEdgeWidth, "gu size", units.gu(1), "kbds", keyboardsModel.count, "mice", miceModel.count + touchPadModel.count, root)
207+ if (longEdgeWidth > units.gu(120)) {
208+ print("longedge is big!")
205− if (miceModel.count + touchPadModel.count > 0) {
209+ if (keyboardsModel.count + miceModel.count + touchPadModel.count > 0) {
206− return "desktop";
210+ return "desktop";
207− } else {
211+ }
208− return deviceConfiguration.category;
212+ } else if (longEdgeWidth > units.gu(90)){
213+ if (miceModel.count + touchPadModel.count > 0) {
214+ return "desktop";
215+ }
209 }
216 }
217+
218+ return deviceConfiguration.category;
210 }
219 }
211 }
220 }
212
221
tests/qmltests/tst_OrientedShell.qml+37−19
@@ -996,37 +996,55 @@ Rectangle {
996 tryCompare(shell, "transformRotationAngle", 0);
996 tryCompare(shell, "transformRotationAngle", 0);
997 }
997 }
998
998
999+ function test_attachRemoveInputDevices_data() {
1000+ return [
1001+ { tag: "small screen, no devices", screenWidth: units.gu(50), mouse: false, kbd: false, expectedMode: "phone", oskExpected: true },
1002+ { tag: "medium screen, no devices", screenWidth: units.gu(100), mouse: false, kbd: false, expectedMode: "phone", oskExpected: true },
1003+ { tag: "big screen, no devices", screenWidth: units.gu(200), mouse: false, kbd: false, expectedMode: "phone", oskExpected: true },
1004+ { tag: "small screen, mouse", screenWidth: units.gu(50), mouse: true, kbd: false, expectedMode: "phone", oskExpected: true },
1005+ { tag: "medium screen, mouse", screenWidth: units.gu(100), mouse: true, kbd: false, expectedMode: "desktop", oskExpected: true },
1006+ { tag: "big screen, mouse", screenWidth: units.gu(200), mouse: true, kbd: false, expectedMode: "desktop", oskExpected: true },
1007+ { tag: "small screen, kbd", screenWidth: units.gu(50), mouse: false, kbd: true, expectedMode: "phone", oskExpected: false },
1008+ { tag: "medium screen, kbd", screenWidth: units.gu(100), mouse: false, kbd: true, expectedMode: "phone", oskExpected: false },
1009+ { tag: "big screen, kbd", screenWidth: units.gu(200), mouse: false, kbd: true, expectedMode: "desktop", oskExpected: false },
1010+ { tag: "small screen, mouse & kbd", screenWidth: units.gu(50), mouse: true, kbd: true, expectedMode: "phone", oskExpected: false },
1011+ { tag: "medium screen, mouse & kbd", screenWidth: units.gu(100), mouse: true, kbd: true, expectedMode: "desktop", oskExpected: false },
1012+ { tag: "big screen, mouse & kbd", screenWidth: units.gu(200), mouse: true, kbd: true, expectedMode: "desktop", oskExpected: false },
1013+ ]
1014+ }
1015+
999− function test_attachRemoveInputDevices() {
1016+ function test_attachRemoveInputDevices(data) {
1000 usageModeSelector.selectedIndex = 2;
1017 usageModeSelector.selectedIndex = 2;
1001 tryCompare(mockUnity8Settings, "usageMode", "Automatic")
1018 tryCompare(mockUnity8Settings, "usageMode", "Automatic")
1002
1019
1003 loadShell("mako")
1020 loadShell("mako")
1004 var shell = findChild(orientedShell, "shell");
1021 var shell = findChild(orientedShell, "shell");
1005
1022
1006− tryCompare(shell, "usageScenario", "phone");
1023+ var oldWidth = orientedShellLoader.width;
1007− tryCompare(mockOskSettings, "stayHidden", false);
1024+ orientedShellLoader.width = data.screenWidth;
1008
1025
1009− MockInputDeviceBackend.addMockDevice("/kbd0", InputInfo.Keyboard);
1010 tryCompare(shell, "usageScenario", "phone");
1026 tryCompare(shell, "usageScenario", "phone");
1011− tryCompare(mockOskSettings, "stayHidden", true);
1012−
1013− MockInputDeviceBackend.addMockDevice("/mouse0", InputInfo.Mouse);
1014− tryCompare(shell, "usageScenario", "desktop");
1015− tryCompare(mockOskSettings, "stayHidden", true);
1016−
1017− MockInputDeviceBackend.removeDevice("/kbd0");
1018− tryCompare(shell, "usageScenario", "desktop");
1019 tryCompare(mockOskSettings, "stayHidden", false);
1027 tryCompare(mockOskSettings, "stayHidden", false);
1020
1028
1029+ if (data.kbd) {
1030+ MockInputDeviceBackend.addMockDevice("/kbd0", InputInfo.Keyboard);
1031+ }
1032+ if (data.mouse) {
1021− MockInputDeviceBackend.removeDevice("/mouse0");
1033+ MockInputDeviceBackend.addMockDevice("/mouse0", InputInfo.Mouse);
1022− tryCompare(shell, "usageScenario", "phone");
1034+ }
1023− tryCompare(mockOskSettings, "stayHidden", false);
1024
1035
1025− MockInputDeviceBackend.addMockDevice("/touchpad0", InputInfo.TouchPad);
1026− tryCompare(shell, "usageScenario", "desktop");
1036+ tryCompare(shell, "usageScenario", data.expectedMode);
1037+ tryCompare(mockOskSettings, "stayHidden", !data.oskExpected);
1027
1038
1039+ if (data.kbd) {
1028− MockInputDeviceBackend.removeDevice("/touchpad0");
1040+ MockInputDeviceBackend.removeDevice("/kbd0");
1029− tryCompare(shell, "usageScenario", "phone");
1041+ }
1042+ if (data.mouse) {
1043+ MockInputDeviceBackend.removeDevice("/mouse0");
1044+ }
1045+
1046+ // Restore width
1047+ orientedShellLoader.width = oldWidth;
1030 }
1048 }
1031
1049
1032 /*
1050 /*