cad5529 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

merge prereq

cad5529Michael Zanetti11 years ago

qml/OrientedShell.qml+13−4

compare with xenial

unifiedsplit

@@ -202,11 +202,20 @@ Rectangle {

202 return "tablet";

203 }

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

qml/Shell.qml+3−3

@@ -1,5 +1,5 @@

1/*

3 *

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

@@ -84,8 +84,8 @@ Item {

84 return Qt.PrimaryOrientation;

85 } else if (greeter && greeter.shown) {

86 return Qt.PrimaryOrientation;

87− } else if (mainApp) {

87+ } else if (applicationsDisplayLoader.item) {

88− return shell.orientations.map(mainApp.supportedOrientations);

88+ return shell.orientations.map(applicationsDisplayLoader.item.supportedOrientations);

89 } else {

90 // we just don't care

91 return Qt.PortraitOrientation

qml/Stages/AbstractStage.qml+5−1

@@ -1,5 +1,5 @@

1/*

3 *

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

@@ -44,6 +44,10 @@ Rectangle {

44 property var mainApp: null

45 property int mainAppWindowOrientationAngle

46 property bool orientationChangesEnabled

47+ property int supportedOrientations: Qt.PortraitOrientation

48+ | Qt.LandscapeOrientation

49+ | Qt.InvertedPortraitOrientation

50+ | Qt.InvertedLandscapeOrientation

48 // Shared code for use in stage implementations

52 // Shared code for use in stage implementations

49 GSettings {

53 GSettings {

qml/Stages/DesktopStage.qml+6−1

@@ -1,5 +1,5 @@

1/*

3 *

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

@@ -40,6 +40,11 @@ AbstractStage {

40 ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)

41 : null

43+ // application windows never rotate independently

44+ mainAppWindowOrientationAngle: shellOrientationAngle

45+

46+ orientationChangesEnabled: true

47+

43 Connections {

48 Connections {

44 target: ApplicationManager

49 target: ApplicationManager

45 onApplicationAdded: {

50 onApplicationAdded: {

qml/Stages/PhoneStage.qml+5−1

@@ -1,5 +1,5 @@

1/*

3 *

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

@@ -83,6 +83,10 @@ AbstractStage {

83 && !(priv.focusedAppDelegate && priv.focusedAppDelegate.xBehavior.running)

84 && spreadView.phase === 0

86+ supportedOrientations: mainApp ? mainApp.supportedOrientations

87+ : (Qt.PortraitOrientation | Qt.LandscapeOrientation

88+ | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation)

89+

86 // How far left the stage has been dragged

90 // How far left the stage has been dragged

87 readonly property real dragProgress: spreadRepeater.count > 0 ? -spreadRepeater.itemAt(0).xTranslate : 0

91 readonly property real dragProgress: spreadRepeater.count > 0 ? -spreadRepeater.itemAt(0).xTranslate : 0

qml/Stages/TabletStage.qml+5−1

@@ -1,5 +1,5 @@

1/*

3 *

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

@@ -72,6 +72,10 @@ AbstractStage {

73 orientationChangesEnabled: priv.mainAppOrientationChangesEnabled

75+ supportedOrientations: mainApp ? mainApp.supportedOrientations

76+ : (Qt.PortraitOrientation | Qt.LandscapeOrientation

77+ | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation)

78+

75 onWidthChanged: {

79 onWidthChanged: {

76 spreadView.selectedIndex = -1;

80 spreadView.selectedIndex = -1;

77 spreadView.phase = 0;

81 spreadView.phase = 0;

tests/qmltests/tst_OrientedShell.qml+103−22

@@ -1,5 +1,5 @@

1/*

3 *

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

@@ -292,6 +292,9 @@ Rectangle {

292 activeFocusOnPress: false

293 text: "Usage Mode"

294 model: ["Staged", "Windowed", "Automatic"]

295+ function selectStaged() {selectedIndex = 0;}

296+ function selectWindowed() {selectedIndex = 1;}

297+ function selectAutomatic() {selectedIndex = 2;}

295 }

298 }

296 MouseTouchEmulationCheckbox {

299 MouseTouchEmulationCheckbox {

297 checked: true

300 checked: true

@@ -393,7 +396,7 @@ Rectangle {

393 activeFocusOnPress: false

396 activeFocusOnPress: false

394 property string prevDevName: "mako"

397 property string prevDevName: "mako"

395 onClicked: {

398 onClicked: {

396− usageModeSelector.selectedIndex = 2; // "Automatic"

399+ usageModeSelector.selectAutomatic();

397

400

398 if (applicationArguments.deviceName === "desktop") {

401 if (applicationArguments.deviceName === "desktop") {

399 applicationArguments.deviceName = prevDevName;

402 applicationArguments.deviceName = prevDevName;

@@ -457,6 +460,8 @@ Rectangle {

457 signalSpy.signalName = "";

460 signalSpy.signalName = "";

458

461

459 LightDM.Greeter.authenticate(""); // reset greeter

462 LightDM.Greeter.authenticate(""); // reset greeter

463+

464+ usageModeSelector.selectStaged();

460 }

465 }

461

466

462 function cleanup() {

467 function cleanup() {

@@ -996,37 +1001,55 @@ Rectangle {

996 tryCompare(shell, "transformRotationAngle", 0);

1001 tryCompare(shell, "transformRotationAngle", 0);

997 }

1002 }

998

1003

1004+ function test_attachRemoveInputDevices_data() {

1005+ return [

1006+ { tag: "small screen, no devices", screenWidth: units.gu(50), mouse: false, kbd: false, expectedMode: "phone", oskExpected: true },

1007+ { tag: "medium screen, no devices", screenWidth: units.gu(100), mouse: false, kbd: false, expectedMode: "phone", oskExpected: true },

1008+ { tag: "big screen, no devices", screenWidth: units.gu(200), mouse: false, kbd: false, expectedMode: "phone", oskExpected: true },

1009+ { tag: "small screen, mouse", screenWidth: units.gu(50), mouse: true, kbd: false, expectedMode: "phone", oskExpected: true },

1010+ { tag: "medium screen, mouse", screenWidth: units.gu(100), mouse: true, kbd: false, expectedMode: "desktop", oskExpected: true },

1011+ { tag: "big screen, mouse", screenWidth: units.gu(200), mouse: true, kbd: false, expectedMode: "desktop", oskExpected: true },

1012+ { tag: "small screen, kbd", screenWidth: units.gu(50), mouse: false, kbd: true, expectedMode: "phone", oskExpected: false },

1013+ { tag: "medium screen, kbd", screenWidth: units.gu(100), mouse: false, kbd: true, expectedMode: "phone", oskExpected: false },

1014+ { tag: "big screen, kbd", screenWidth: units.gu(200), mouse: false, kbd: true, expectedMode: "desktop", oskExpected: false },

1015+ { tag: "small screen, mouse & kbd", screenWidth: units.gu(50), mouse: true, kbd: true, expectedMode: "phone", oskExpected: false },

1016+ { tag: "medium screen, mouse & kbd", screenWidth: units.gu(100), mouse: true, kbd: true, expectedMode: "desktop", oskExpected: false },

1017+ { tag: "big screen, mouse & kbd", screenWidth: units.gu(200), mouse: true, kbd: true, expectedMode: "desktop", oskExpected: false },

1018+ ]

1019+ }

1020+

999− function test_attachRemoveInputDevices() {

1021+ function test_attachRemoveInputDevices(data) {

1000− usageModeSelector.selectedIndex = 2;

1022+ usageModeSelector.selectAutomatic();

1001 tryCompare(mockUnity8Settings, "usageMode", "Automatic")

1023 tryCompare(mockUnity8Settings, "usageMode", "Automatic")

1002

1024

1003 loadShell("mako")

1025 loadShell("mako")

1004 var shell = findChild(orientedShell, "shell");

1026 var shell = findChild(orientedShell, "shell");

1005

1027

1006− tryCompare(shell, "usageScenario", "phone");

1028+ var oldWidth = orientedShellLoader.width;

1007− tryCompare(mockOskSettings, "stayHidden", false);

1029+ orientedShellLoader.width = data.screenWidth;

1008

1030

1009− MockInputDeviceBackend.addMockDevice("/kbd0", InputInfo.Keyboard);

1010 tryCompare(shell, "usageScenario", "phone");

1031 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);

1032 tryCompare(mockOskSettings, "stayHidden", false);

1020

1033

1034+ if (data.kbd) {

1035+ MockInputDeviceBackend.addMockDevice("/kbd0", InputInfo.Keyboard);

1036+ }

1037+ if (data.mouse) {

1021− MockInputDeviceBackend.removeDevice("/mouse0");

1038+ MockInputDeviceBackend.addMockDevice("/mouse0", InputInfo.Mouse);

1022− tryCompare(shell, "usageScenario", "phone");

1039+ }

1023− tryCompare(mockOskSettings, "stayHidden", false);

1024

1040

1025− MockInputDeviceBackend.addMockDevice("/touchpad0", InputInfo.TouchPad);

1026− tryCompare(shell, "usageScenario", "desktop");

1041+ tryCompare(shell, "usageScenario", data.expectedMode);

1042+ tryCompare(mockOskSettings, "stayHidden", !data.oskExpected);

1027

1043

1044+ if (data.kbd) {

1028− MockInputDeviceBackend.removeDevice("/touchpad0");

1045+ MockInputDeviceBackend.removeDevice("/kbd0");

1029− tryCompare(shell, "usageScenario", "phone");

1046+ }

1047+ if (data.mouse) {

1048+ MockInputDeviceBackend.removeDevice("/mouse0");

1049+ }

1050+

1051+ // Restore width

1052+ orientedShellLoader.width = oldWidth;

1030 }

1053 }

1031

1054

1032 /*

1055 /*

@@ -1140,6 +1163,61 @@ Rectangle {

1140 tryCompare(shell, "transformRotationAngle" , 0);

1163 tryCompare(shell, "transformRotationAngle" , 0);

1141 }

1164 }

1142

1165

1166+ /*

1167+ Regression test for https://launchpad.net/bugs/1515977

1168+

1169+ Preconditions:

1170+ UI in Desktop mode and landscape

1171+

1172+ Steps:

1173+ - Launch a portrait-only application

1174+

1175+ Expected outcome:

1176+ - Shell stays in landscape

1177+

1178+ Buggy outcome:

1179+ - Shell would rotate to portrait as the newly-focused app doesn't support landscape

1180+ */

1181+ function test_portraitOnlyAppInLandscapeDesktop_data() {

1182+ return [

1183+ {tag: "mako", deviceName: "mako"},

1184+ {tag: "manta", deviceName: "manta"},

1185+ {tag: "flo", deviceName: "flo"}

1186+ ];

1187+ }

1188+ function test_portraitOnlyAppInLandscapeDesktop(data) {

1189+ loadShell(data.deviceName);

1190+

1191+ ////

1192+ // setup preconditions (put shell in Desktop mode and landscape)

1193+

1194+ usageModeSelector.selectWindowed();

1195+

1196+ orientedShell.physicalOrientation = orientedShell.orientations.landscape;

1197+ waitUntilShellIsInOrientation(orientedShell.orientations.landscape);

1198+ waitForRotationAnimationsToFinish();

1199+

1200+ ////

1201+ // Launch a portrait-only application

1202+

1203+ var dialerApp = ApplicationManager.startApplication("dialer-app");

1204+ verify(dialerApp);

1205+

1206+ // ensure the mock dialer-app is as we expect

1207+ compare(dialerApp.rotatesWindowContents, false);

1208+ compare(dialerApp.supportedOrientations, Qt.PortraitOrientation | Qt.InvertedPortraitOrientation);

1209+

1210+ waitUntilAppSurfaceShowsUp("dialer-app");

1211+ waitUntilAppWindowCanRotate("dialer-app");

1212+ verify(isAppSurfaceFocused("dialer-app"));

1213+

1214+ ////

1215+ // check outcome (shell should stay in landscape)

1216+

1217+ waitForRotationAnimationsToFinish();

1218+ compare(shell.orientation, orientedShell.orientations.landscape);

1219+ }

1220+

1143 // angle - rotation angle in degrees clockwise, relative to the primary orientation.

1221 // angle - rotation angle in degrees clockwise, relative to the primary orientation.

1144 function rotateTo(angle) {

1222 function rotateTo(angle) {

1145 switch (angle) {

1223 switch (angle) {

@@ -1158,7 +1236,10 @@ Rectangle {

1158 default:

1236 default:

1159 verify(false);

1237 verify(false);

1160 }

1238 }

1239+ waitForRotationAnimationsToFinish();

1240+ }

1161

1241

1242+ function waitForRotationAnimationsToFinish() {

1162 var rotationStates = findInvisibleChild(orientedShell, "rotationStates");

1243 var rotationStates = findInvisibleChild(orientedShell, "rotationStates");

1163 verify(rotationStates.d);

1244 verify(rotationStates.d);

1164 verify(rotationStates.d.stateUpdateTimer);

1245 verify(rotationStates.d.stateUpdateTimer);