git.iko.soy/unity8
on xenial help sign in
Fix typos
b4b4c49Josh Arenson
qml/DeviceConfiguration.qml+1−1
compare with xenial
unifiedsplit
@@ -19,7 +19,7 @@ import QtQuick 2.0
19QtObject {
19QtObject {
20 id: root
20 id: root
21
21
22− readonly property int seNativeOrientation: -1
22+ readonly property int useNativeOrientation: -1
23
23
24 // The only writable property in the API
24 // The only writable property in the API
25 // all other properties are set according to the device name
25 // all other properties are set according to the device name
qml/OrientedShell.qml+6−6
@@ -42,8 +42,8 @@ Rectangle {
42 // NB: native and primary orientations here don't map exactly to their QScreen counterparts
42 // NB: native and primary orientations here don't map exactly to their QScreen counterparts
43 native_: root.width > root.height ? Qt.LandscapeOrientation : Qt.PortraitOrientation
43 native_: root.width > root.height ? Qt.LandscapeOrientation : Qt.PortraitOrientation
44
44
45− primary: deviceConfiguration.primaryOrientation == deviceConfiguration.UseNativeOrientation
45+ primary: deviceConfiguration.primaryOrientation == deviceConfiguration.useNativeOrientation
46− ? nativeOrientation : deviceConfiguration.primaryOrientation
46+ ? native_ : deviceConfiguration.primaryOrientation
47
47
48 landscape: deviceConfiguration.landscapeOrientation
48 landscape: deviceConfiguration.landscapeOrientation
49 invertedLandscape: deviceConfiguration.invertedLandscapeOrientation
49 invertedLandscape: deviceConfiguration.invertedLandscapeOrientation
@@ -127,15 +127,15 @@ Rectangle {
127 function angleToOrientation(angle) {
127 function angleToOrientation(angle) {
128 switch (angle) {
128 switch (angle) {
129 case 0:
129 case 0:
130− return nativeOrientation;
130+ return orientations.native_;
131 case 90:
131 case 90:
132− return nativeOrientation === Qt.PortraitOrientation ? Qt.InvertedLandscapeOrientation
132+ return orientations.native_ === Qt.PortraitOrientation ? Qt.InvertedLandscapeOrientation
133 : Qt.PortraitOrientation;
133 : Qt.PortraitOrientation;
134 case 180:
134 case 180:
135− return nativeOrientation === Qt.PortraitOrientation ? Qt.InvertedPortraitOrientation
135+ return orientations.native_ === Qt.PortraitOrientation ? Qt.InvertedPortraitOrientation
136 : Qt.InvertedLandscapeOrientation;
136 : Qt.InvertedLandscapeOrientation;
137 case 270:
137 case 270:
138− return nativeOrientation === Qt.PortraitOrientation ? Qt.LandscapeOrientation
138+ return orientations.native_ === Qt.PortraitOrientation ? Qt.LandscapeOrientation
139 : Qt.InvertedPortraitOrientation;
139 : Qt.InvertedPortraitOrientation;
140 default:
140 default:
141 console.warn("angleToOrientation: Invalid orientation angle: " + angle);
141 console.warn("angleToOrientation: Invalid orientation angle: " + angle);