Add fixes from upstream from auroud_85

2 files changed, 6 insertions, 45 deletions

diff --git a/Background.qml b/Background.qml
index a6a85c7..5a38415 100644
--- a/Background.qml
+++ b/Background.qml
@@ -43,7 +43,7 @@ FocusScope {
     states: [
         State {
             name: "imageBackground"
-            when: sceneBackgroundType == "image"
+            when: sceneBackgroundType === "image"
             PropertyChanges {
                 target: sceneColorBackground
                 visible: false
@@ -55,7 +55,7 @@ FocusScope {
         },
         State {
             name: "colorBackground"
-            when: sceneBackgroundType != "image"
+            when: sceneBackgroundType !== "image"
             PropertyChanges {
                 target: sceneColorBackground
                 visible: true
diff --git a/Main.qml b/Main.qml
index 43e444e..f98d74a 100644
--- a/Main.qml
+++ b/Main.qml
@@ -258,6 +258,9 @@ PlasmaCore.ColorScope {
             onKeyboardActiveChanged: {
                 if (keyboardActive) {
                     state = "visible"
+                    // Otherwise the password field loses focus and virtual keyboard
+                    // keystrokes get eaten
+                    userListComponent.mainPasswordBox.forceActiveFocus();
                 } else {
                     state = "hidden";
                 }
@@ -424,49 +427,7 @@ PlasmaCore.ColorScope {
                 ]
             }
         }
-
-        DropShadow {
-            id: logoShadow
-            anchors.fill: logo
-            source: logo
-            visible: !softwareRendering && config.showlogo == "shown"
-            horizontalOffset: 1
-            verticalOffset: 1
-            radius: 6
-            samples: 14
-            spread: 0.3
-            color: "black" // matches Breeze window decoration and desktopcontainment
-            opacity: loginScreenRoot.uiVisible ? 0 : 1
-            Behavior on opacity {
-                //OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)"
-                NumberAnimation {
-                    duration: units.longDuration
-                    easing.type: Easing.InOutQuad
-                }
-            }
-        }
-
-        Image {
-            id: logo
-            visible: config.showlogo == "shown"
-            source: config.logo
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.bottom: footer.top
-            anchors.bottomMargin: units.largeSpacing
-            asynchronous: true
-            sourceSize.height: height
-            opacity: loginScreenRoot.uiVisible ? 0 : 1
-            fillMode: Image.PreserveAspectFit
-            height: Math.round(units.gridUnit * 3.5)
-            Behavior on opacity {
-                // OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)"
-                NumberAnimation {
-                    duration: units.longDuration
-                    easing.type: Easing.InOutQuad
-                }
-            }
-        }
-
+        
         //Footer
         RowLayout {
             id: footer