git.iko.soy/unity8
on xenial help sign in
Fix tests
commitf82b9154fdadfa575ab305fc1f49426fd4a09563 authorMichael Terry <michael.terry@canonical.com> dateTue 12 Apr 2016, 09:58 (11 years ago) parentb1e36e5
2 files changed+4−4
compare with xenial
unifiedsplit
qml/OrientedShell.qml+1−1 tests/qmltests/tst_OrientedShell.qml+3−3
qml/OrientedShell.qml+1−1
@@ -111,7 +111,7 @@ Rectangle {
111111 unity8Settings.usageMode = "Staged";
112112 }
113113 } else {
114− if (Math.min(Screen.width, Screen.height) > units.gu(60)) {
114+ if (Math.min(root.width, root.height) > units.gu(60)) {
115115 if (pointerInputDevices > 0 && pointerInputDevices > miceModel.oldCount + touchPadModel.oldCount) {
116116 unity8Settings.usageMode = "Windowed";
117117 }
tests/qmltests/tst_OrientedShell.qml+3−3
@@ -100,7 +100,7 @@ Rectangle {
100100 PropertyChanges {
101101 target: orientedShellLoader
102102 width: units.gu(160)
103− height: units.gu(100)
103+ height: units.gu(60)
104104 }
105105 PropertyChanges {
106106 target: root
@@ -115,7 +115,7 @@ Rectangle {
115115 name: "flo"
116116 PropertyChanges {
117117 target: orientedShellLoader
118− width: units.gu(62)
118+ width: units.gu(60)
119119 height: units.gu(100)
120120 }
121121 PropertyChanges {
@@ -132,7 +132,7 @@ Rectangle {
132132 PropertyChanges {
133133 target: orientedShellLoader
134134 width: units.gu(100)
135− height: units.gu(56)
135+ height: units.gu(65)
136136 }
137137 PropertyChanges {
138138 target: root