git.iko.soy/unity8
on xenial help sign in
Fix tests
f82b915Michael Terry
qml/OrientedShell.qml+1−1
compare with xenial
unifiedsplit
@@ -111,7 +111,7 @@ Rectangle {
111 unity8Settings.usageMode = "Staged";
111 unity8Settings.usageMode = "Staged";
112 }
112 }
113 } else {
113 } else {
114− if (Math.min(Screen.width, Screen.height) > units.gu(60)) {
114+ if (Math.min(root.width, root.height) > units.gu(60)) {
115 if (pointerInputDevices > 0 && pointerInputDevices > miceModel.oldCount + touchPadModel.oldCount) {
115 if (pointerInputDevices > 0 && pointerInputDevices > miceModel.oldCount + touchPadModel.oldCount) {
116 unity8Settings.usageMode = "Windowed";
116 unity8Settings.usageMode = "Windowed";
117 }
117 }
tests/qmltests/tst_OrientedShell.qml+3−3
@@ -100,7 +100,7 @@ Rectangle {
100 PropertyChanges {
100 PropertyChanges {
101 target: orientedShellLoader
101 target: orientedShellLoader
102 width: units.gu(160)
102 width: units.gu(160)
103− height: units.gu(100)
103+ height: units.gu(60)
104 }
104 }
105 PropertyChanges {
105 PropertyChanges {
106 target: root
106 target: root
@@ -115,7 +115,7 @@ Rectangle {
115 name: "flo"
115 name: "flo"
116 PropertyChanges {
116 PropertyChanges {
117 target: orientedShellLoader
117 target: orientedShellLoader
118− width: units.gu(62)
118+ width: units.gu(60)
119 height: units.gu(100)
119 height: units.gu(100)
120 }
120 }
121 PropertyChanges {
121 PropertyChanges {
@@ -132,7 +132,7 @@ Rectangle {
132 PropertyChanges {
132 PropertyChanges {
133 target: orientedShellLoader
133 target: orientedShellLoader
134 width: units.gu(100)
134 width: units.gu(100)
135− height: units.gu(56)
135+ height: units.gu(65)
136 }
136 }
137 PropertyChanges {
137 PropertyChanges {
138 target: root
138 target: root