Use shellContainer for animations and sizes

ubports · Aug 5, 2021 · bb9bc8d · bb9bc8d
1 parent 7fea6c3
commit bb9bc8d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/qml/OrientedShell.qml b/qml/OrientedShell.qml
@@ -264,18 +264,19 @@ Item {
     }
 
     Item {
+        id: shellContainer
         anchors.fill: parent
         anchors.topMargin: !unity8Settings.disableTopMargin ? deviceConfiguration.topMargin : 0
 
         Shell {
             id: shell
             objectName: "shell"
-            width: root.width
-            height: root.height
+            width: parent.width
+            height: parent.height
             orientation: root.angleToOrientation(orientationAngle)
             orientations: root.orientations
-            nativeWidth: root.width
-            nativeHeight: root.height
+            nativeWidth: parent.width
+            nativeHeight: parent.height
             mode: applicationArguments.mode
             hasMouse: pointerInputDevices > 0
             hasKeyboard: keyboardsModel.count > 0
@@ -323,8 +324,8 @@ Item {
             id: shellSnapshot
             target: shell
             visible: false
-            width: root.width
-            height: root.height
+            width: parent.width
+            height: parent.height
 
             property real transformRotationAngle
             property real transformOriginX

diff --git a/qml/Rotation/HalfLoopRotationAnimation.qml b/qml/Rotation/HalfLoopRotationAnimation.qml
@@ -30,8 +30,8 @@ SequentialAnimation {
     ScriptAction { script: {
         info.transitioning = true;
         shell.orientationAngle = root.toAngle;
-        shell.x = (orientedShell.width - shell.width) / 2
-        shell.y = (orientedShell.height - shell.height) / 2;
+        shell.x = (shellContainer.width - shell.width) / 2
+        shell.y = (shellContainer.height - shell.height) / 2;
         shell.transformOriginX = shell.width / 2;
         shell.transformOriginY = shell.height / 2;
         shell.updateFocusedAppOrientation();

diff --git a/qml/Rotation/NinetyRotationAnimation.qml b/qml/Rotation/NinetyRotationAnimation.qml
@@ -24,19 +24,19 @@ SequentialAnimation {
     property var info
     property var shell
 
-    readonly property real fromY: fromAngle === 0 || fromAngle === 90 ? 0 : orientedShell.height - orientedShell.width;
-    readonly property real toY: toAngle === 0 || toAngle === 90 ? 0 : orientedShell.height - orientedShell.width;
+    readonly property real fromY: fromAngle === 0 || fromAngle === 90 ? 0 : shellContainer.height - shellContainer.width;
+    readonly property real toY: toAngle === 0 || toAngle === 90 ? 0 : shellContainer.height - shellContainer.width;
     readonly property bool flipShellDimensions: toAngle == 90 || toAngle == 270
 
     ScriptAction { script: {
         info.transitioning = true;
 
         shell.orientationAngle = root.toAngle;
         shell.x = 0;
-        shell.width = flipShellDimensions ? orientedShell.height : orientedShell.width;
-        shell.height = flipShellDimensions ? orientedShell.width : orientedShell.height;
-        shell.transformOriginX = orientedShell.width / 2;
-        shell.transformOriginY = orientedShell.width / 2;
+        shell.width = flipShellDimensions ? shellContainer.height : shellContainer.width;
+        shell.height = flipShellDimensions ? shellContainer.width : shellContainer.height;
+        shell.transformOriginX = shellContainer.width / 2;
+        shell.transformOriginY = shellContainer.width / 2;
         shell.updateFocusedAppOrientation();
         shellCover.visible = true;
 

diff --git a/qml/Rotation/UpdateShellTransformations.qml b/qml/Rotation/UpdateShellTransformations.qml
@@ -25,17 +25,18 @@ ScriptAction {
         shell.transformRotationAngle = rotationAngle;
 
         // They must all be bindings as orientedShell's size can change
+        // ( shellContainer takes into account the margin in case a notch is present )
 
         if (rotationAngle === 90 || rotationAngle === 270) {
-            shell.width = Qt.binding(function() { return orientedShell.height; });
-            shell.height = Qt.binding(function() { return orientedShell.width; });
+            shell.width = Qt.binding(function() { return shellContainer.height; });
+            shell.height = Qt.binding(function() { return shellContainer.width; });
         } else {
-            shell.width = Qt.binding(function() { return orientedShell.width; });
-            shell.height = Qt.binding(function() { return orientedShell.height; });
+            shell.width = Qt.binding(function() { return shellContainer.width; });
+            shell.height = Qt.binding(function() { return shellContainer.height; });
         }
 
-        shell.x = Qt.binding(function() { return (orientedShell.width - shell.width) / 2; });
-        shell.y = Qt.binding(function() { return (orientedShell.height - shell.height) / 2; });
+        shell.x = Qt.binding(function() { return (shellContainer.width - shell.width) / 2; });
+        shell.y = Qt.binding(function() { return (shellContainer.height - shell.height) / 2; });
         shell.transformOriginX = Qt.binding(function() { return shell.width / 2; });
         shell.transformOriginY = Qt.binding(function() { return shell.height / 2; });
     }