git.iko.soy/unity8
on xenial help sign in
Remerge lp:~unity-team/unity8/rotate-n7
cf4a478Albert Astals
qml/Components/ApplicationScreenshot.qml+6−11
compare with xenial
unifiedsplit
@@ -15,7 +15,6 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import QtQuick.Window 2.0
19import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
20import Unity.Application 0.1
19import Unity.Application 0.1
21
20
@@ -51,15 +50,11 @@ Item {
51 visible: applicationScreenshot.withBackground
50 visible: applicationScreenshot.withBackground
52 }
51 }
53
52
54− OrientationHelper {
55− orientationAngle: Screen.angleBetween(Screen.primaryOrientation, nativeOrientation) // compensate for Shell rotation
56− transitionEnabled: false
57− ApplicationImage {
53+ ApplicationImage {
58− id: applicationImage
54+ id: applicationImage
59− objectName: "screenshot image"
55+ objectName: "screenshot image"
60− anchors.fill: parent
56+ anchors.fill: parent
61− visible: applicationScreenshot.application != null && ready
57+ visible: applicationScreenshot.application != null && ready
62− source: ApplicationManager.findApplication((application) ? application.appId : "")
58+ source: ApplicationManager.findApplication((application) ? application.appId : "")
63− }
64 }
59 }
65}
60}
qml/Shell.qml−15
@@ -759,21 +759,6 @@ FocusScope {
759 value: "unity8"
759 value: "unity8"
760 }
760 }
761
761
762− OSKController {
763− anchors.topMargin: panel.panelHeight
764− anchors.fill: parent // as needs to know the geometry of the shell
765− }
766−
767− //FIXME: This should be handled in the input stack, keyboard shouldnt propagate
768− MouseArea {
769− anchors.bottom: parent.bottom
770− anchors.left: parent.left
771− anchors.right: parent.right
772− height: shell.applicationManager ? shell.applicationManager.keyboardHeight : 0
773−
774− enabled: shell.applicationManager && shell.applicationManager.keyboardVisible
775− }
776−
777 Label {
762 Label {
778 anchors.centerIn: parent
763 anchors.centerIn: parent
779 visible: applicationManager.fake
764 visible: applicationManager.fake
qml/ShellOrientator.qml+6−1
@@ -17,7 +17,7 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import QtQuick.Window 2.0
18import QtQuick.Window 2.0
19import Ubuntu.Components 0.1
19import Ubuntu.Components 0.1
20−import Ubuntu.Gestures 0.1
20+import Unity.Application 0.1
21
21
22Item {
22Item {
23 id: orientator
23 id: orientator
@@ -31,7 +31,12 @@ Item {
31 orientationAngle: Screen.angleBetween(nativeOrientation, Screen.primaryOrientation)
31 orientationAngle: Screen.angleBetween(nativeOrientation, Screen.primaryOrientation)
32 transitionEnabled: false
32 transitionEnabled: false
33 Shell {
33 Shell {
34+ id: shell
34 anchors.fill: parent
35 anchors.fill: parent
35 }
36 }
36 }
37 }
38+
39+ OSKController {
40+ anchors.fill: parent // as needs to know the geometry of the shell
41+ }
37}
42}
src/main.cpp+1−1
@@ -93,7 +93,7 @@ int startShell(int argc, const char** argv, void* server)
93 }
93 }
94
94
95 const QByteArray orientation = qgetenv("NATIVE_ORIENTATION");
95 const QByteArray orientation = qgetenv("NATIVE_ORIENTATION");
96− Qt::ScreenOrientation orientationAngle = Qt::PortraitOrientation;
96+ Qt::ScreenOrientation orientationAngle = Qt::PrimaryOrientation;
97 if (orientation == "landscape") {
97 if (orientation == "landscape") {
98 orientationAngle = Qt::LandscapeOrientation;
98 orientationAngle = Qt::LandscapeOrientation;
99 } else if (!orientation.isEmpty() && orientation != "portrait") {
99 } else if (!orientation.isEmpty() && orientation != "portrait") {