git.iko.soy/unity8
on xenial help sign in
Fix typos
commitb4b4c4997a16a0ce77e0bab37d97e85603c8e9e9 authorJosh Arenson <joshua.arenson@canonical.com> dateFri 25 Sep 2015, 09:13 (11 years ago) parent966002c
2 files changed+7−7
compare with xenial
unifiedsplit
qml/DeviceConfiguration.qml+1−1 qml/OrientedShell.qml+6−6
qml/DeviceConfiguration.qml+1−1
@@ -19,7 +19,7 @@ import QtQuick 2.0
1919QtObject {
2020 id: root
2121
22− readonly property int seNativeOrientation: -1
22+ readonly property int useNativeOrientation: -1
2323
2424 // The only writable property in the API
2525 // all other properties are set according to the device name
qml/OrientedShell.qml+6−6
@@ -42,8 +42,8 @@ Rectangle {
4242 // NB: native and primary orientations here don't map exactly to their QScreen counterparts
4343 native_: root.width > root.height ? Qt.LandscapeOrientation : Qt.PortraitOrientation
4444
45− primary: deviceConfiguration.primaryOrientation == deviceConfiguration.UseNativeOrientation
46− ? nativeOrientation : deviceConfiguration.primaryOrientation
45+ primary: deviceConfiguration.primaryOrientation == deviceConfiguration.useNativeOrientation
46+ ? native_ : deviceConfiguration.primaryOrientation
4747
4848 landscape: deviceConfiguration.landscapeOrientation
4949 invertedLandscape: deviceConfiguration.invertedLandscapeOrientation
@@ -127,15 +127,15 @@ Rectangle {
127127 function angleToOrientation(angle) {
128128 switch (angle) {
129129 case 0:
130− return nativeOrientation;
130+ return orientations.native_;
131131 case 90:
132− return nativeOrientation === Qt.PortraitOrientation ? Qt.InvertedLandscapeOrientation
132+ return orientations.native_ === Qt.PortraitOrientation ? Qt.InvertedLandscapeOrientation
133133 : Qt.PortraitOrientation;
134134 case 180:
135− return nativeOrientation === Qt.PortraitOrientation ? Qt.InvertedPortraitOrientation
135+ return orientations.native_ === Qt.PortraitOrientation ? Qt.InvertedPortraitOrientation
136136 : Qt.InvertedLandscapeOrientation;
137137 case 270:
138− return nativeOrientation === Qt.PortraitOrientation ? Qt.LandscapeOrientation
138+ return orientations.native_ === Qt.PortraitOrientation ? Qt.LandscapeOrientation
139139 : Qt.InvertedPortraitOrientation;
140140 default:
141141 console.warn("angleToOrientation: Invalid orientation angle: " + angle);