[AppSwitcher] fix app window rotation on appswitcher

src/qml/AppSwitcher.qml

@@ -50,7 +50,7 @@ Item {
     Flickable {
         id: flickable
         contentHeight: gridview.height
-        width: parent.width - 10 // see comment re right anchor below
+        width: closeMode ? parent.width - 20 : parent.width // see comment re right anchor below
 
         MouseArea {
             height: flickable.contentHeight > flickable.height ? flickable.contentHeight : flickable.height
@@ -64,16 +64,17 @@ Item {
 
         anchors {
             top: parent.top
+            topMargin: closeMode ? 20 : 0
             bottom: toolBar.top
             left: parent.left
             // no right anchor to avoid double margin (complicated math)
-            margins: 10
+            leftMargin: closeMode ? 20 : 0
         }
 
         Grid {
             id: gridview
             columns: 2
-            spacing: 10
+            spacing: closeMode ? 20 : 0
             move: Transition {
                 NumberAnimation {
                     properties: "x,y"

src/qml/CloseButton.qml

@@ -27,7 +27,9 @@ Image {
     id: closeButton
     signal clicked()
 
-    source: '/usr/share/lipstick-glacier-home-qt5/qml/theme/icon-m-framework-close-thumbnail.png'
+    source: '/usr/share/lipstick-glacier-home-qt5/qml/images/closeapp.svg'
+    sourceSize.width: width
+    sourceSize.height: height
 
     MouseArea {
         anchors.fill: parent

src/qml/SwitcherItem.qml

@@ -34,11 +34,11 @@ MouseArea {
 
     WindowPixmapItem {
         id: windowPixmap
-        width: rotateWindowContent ? parent.height : parent.width
-        height: rotateWindowContent ? parent.width : parent.height
+        width: rotateWindowContent ? parent.width : parent.height
+        height: rotateWindowContent ? parent.height : parent.width
         windowId: model.window
         transform: Rotation {
-            angle: rotateWindowContent ? 90 : 0
+            angle: rotateWindowContent ? 0 : 90
             origin.x: windowPixmap.height / 2
             origin.y: windowPixmap.height / 2
         }
@@ -95,12 +95,15 @@ MouseArea {
 
     CloseButton {
         id: closeButton
+        width: parent.width/4
+        height: width
         Behavior on scale { PropertyAnimation { duration: 300; easing.type: Easing.OutBack } }
         scale: switcherRoot.closeMode ? 1 : 0
         opacity: scale
         enabled: !closeAnimation.running
         anchors {
             bottom: parent.bottom
+            bottomMargin: height*0.5
             horizontalCenter: parent.horizontalCenter
         }
         onClicked: closeAnimation.start()

src/src.pro

@@ -13,7 +13,8 @@ styles.files = nemovars.conf
 
 images.path = /usr/share/lipstick-glacier-home-qt5/qml/images
 images.files = qml/images/*.png \
-               qml/images/*.jpg
+               qml/images/*.jpg \
+               qml/images/*.svg
 
 theme.path = /usr/share/lipstick-glacier-home-qt5/qml/theme
 theme.files = qml/theme/*.png