diff options
Diffstat (limited to 'Main.qml')
| -rw-r--r-- | Main.qml | 75 |
1 files changed, 61 insertions, 14 deletions
@@ -159,7 +159,7 @@ PlasmaCore.ColorScope { left: parent.left right: parent.right } - height: root.height + units.gridUnit * 3 + height: root.height + PlasmaCore.Units.gridUnit * 3 focus: true //StackView is an implicit focus scope, so we need to give this focus so the item inside will have it @@ -181,7 +181,15 @@ PlasmaCore.ColorScope { userListCurrentIndex: userModel.lastIndex >= 0 ? userModel.lastIndex : 0 lastUserName: userModel.lastUser showUserList: { - return false + if ( !userListModel.hasOwnProperty("count") + || !userListModel.hasOwnProperty("disableAvatarsThreshold")) + return (userList.y + mainStack.y) > 0 + + if ( userListModel.count === 0 ) return false + + if ( userListModel.hasOwnProperty("containsAllUsers") && !userListModel.containsAllUsers ) return false + + return userListModel.count <= userListModel.disableAvatarsThreshold && (userList.y + mainStack.y) > 0 } notificationMessage: { @@ -238,7 +246,7 @@ PlasmaCore.ColorScope { Behavior on opacity { OpacityAnimator { - duration: units.longDuration + duration: PlasmaCore.Units.longDuration } } } @@ -250,9 +258,6 @@ 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"; } @@ -308,18 +313,18 @@ PlasmaCore.ColorScope { NumberAnimation { target: mainStack property: "y" - duration: units.longDuration + duration: PlasmaCore.Units.longDuration easing.type: Easing.InOutQuad } NumberAnimation { target: inputPanel property: "y" - duration: units.longDuration + duration: PlasmaCore.Units.longDuration easing.type: Easing.OutQuad } OpacityAnimator { target: inputPanel - duration: units.longDuration + duration: PlasmaCore.Units.longDuration easing.type: Easing.OutQuad } } @@ -333,18 +338,18 @@ PlasmaCore.ColorScope { NumberAnimation { target: mainStack property: "y" - duration: units.longDuration + duration: PlasmaCore.Units.longDuration easing.type: Easing.InOutQuad } NumberAnimation { target: inputPanel property: "y" - duration: units.longDuration + duration: PlasmaCore.Units.longDuration easing.type: Easing.InQuad } OpacityAnimator { target: inputPanel - duration: units.longDuration + duration: PlasmaCore.Units.longDuration easing.type: Easing.InQuad } } @@ -419,7 +424,49 @@ 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: PlasmaCore.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: PlasmaCore.Units.largeSpacing + asynchronous: true + sourceSize.height: height + opacity: loginScreenRoot.uiVisible ? 0 : 1 + fillMode: Image.PreserveAspectFit + height: Math.round(PlasmaCore.Units.gridUnit * 3.5) + Behavior on opacity { + // OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)" + NumberAnimation { + duration: PlasmaCore.Units.longDuration + easing.type: Easing.InOutQuad + } + } + } + //Footer RowLayout { id: footer @@ -432,7 +479,7 @@ PlasmaCore.ColorScope { Behavior on opacity { OpacityAnimator { - duration: units.longDuration + duration: PlasmaCore.Units.longDuration } } |