From d6ec22375b9cd3ece29fe3d3e806be89a63a0f64 Mon Sep 17 00:00:00 2001 From: Devin Lin Date: Sun, 11 Feb 2024 17:59:36 -0500 Subject: [PATCH] lockscreen: Remove bottom arrow animation Wastes battery as it keeps running with the display off --- .../lockscreen/BottomIconIndicator.qml | 31 ------------------- lookandfeel/contents/lockscreen/Keypad.qml | 2 +- .../contents/lockscreen/LockScreen.qml | 2 +- .../contents/lockscreen/LockScreenState.qml | 4 +-- 4 files changed, 4 insertions(+), 35 deletions(-) diff --git a/lookandfeel/contents/lockscreen/BottomIconIndicator.qml b/lookandfeel/contents/lockscreen/BottomIconIndicator.qml index a7419b20..851186b2 100644 --- a/lookandfeel/contents/lockscreen/BottomIconIndicator.qml +++ b/lookandfeel/contents/lockscreen/BottomIconIndicator.qml @@ -13,37 +13,6 @@ Loader { property var lockScreenState - property real animationY: 0 - readonly property real fullYOffset: Kirigami.Units.largeSpacing - - // animate it going up and down - NumberAnimation on animationY { - id: animateUpAndDown - duration: 800 - easing.type: Easing.InCubic - to: root.fullYOffset - - // only bounce icon if we are showing the scroll up icon - running: !lockScreenState.isFingerprintSupported - - onFinished: { - if (root.animationY === root.fullYOffset) { - to = 0; - easing.type = Easing.OutCubic; - } else { - to = root.fullYOffset; - easing.type = Easing.InCubic; - } - restart(); - } - - onStopped: { - if (lockScreenState.isFingerprintSupported) { - root.animationY = 0; - } - } - } - sourceComponent: { if (lockScreenState.isFingerprintSupported) { return fingerprintIcon; diff --git a/lookandfeel/contents/lockscreen/Keypad.qml b/lookandfeel/contents/lockscreen/Keypad.qml index d490ddfe..3988e5fa 100644 --- a/lookandfeel/contents/lockscreen/Keypad.qml +++ b/lookandfeel/contents/lockscreen/Keypad.qml @@ -139,7 +139,7 @@ Rectangle { shadowEnabled: true shadowVerticalOffset: 1 shadowOpacity: 0.3 - shadowColor: button.pressed ? keypadRoot.buttonPressedColor : keypadRoot.dropShadowColor + shadowColor: keypadRoot.dropShadowColor } onPressedChanged: { diff --git a/lookandfeel/contents/lockscreen/LockScreen.qml b/lookandfeel/contents/lockscreen/LockScreen.qml index 370c4129..6322a8e1 100644 --- a/lookandfeel/contents/lockscreen/LockScreen.qml +++ b/lookandfeel/contents/lockscreen/LockScreen.qml @@ -159,7 +159,7 @@ Item { lockScreenState: root.lockScreenState anchors.bottom: parent.bottom - anchors.bottomMargin: Kirigami.Units.gridUnit + flickable.position * 0.5 + scrollUpIconLoader.animationY + anchors.bottomMargin: Kirigami.Units.gridUnit + flickable.position * 0.5 anchors.horizontalCenter: parent.horizontalCenter } diff --git a/lookandfeel/contents/lockscreen/LockScreenState.qml b/lookandfeel/contents/lockscreen/LockScreenState.qml index cb1f82ba..f7ac41bd 100644 --- a/lookandfeel/contents/lockscreen/LockScreenState.qml +++ b/lookandfeel/contents/lockscreen/LockScreenState.qml @@ -4,7 +4,7 @@ import QtQml import QtQuick -import org.kde.kscreenlocker 1.0 as ScreenLocker +// import org.kde.kscreenlocker 1.0 as ScreenLocker QtObject { id: root @@ -22,7 +22,7 @@ QtObject { property bool passwordless: false // TODO true // whether the device can login with fingerprint - readonly property bool isFingerprintSupported: authenticator.authenticatorTypes & ScreenLocker.Authenticator.Fingerprint + readonly property bool isFingerprintSupported: authenticator.authenticatorTypes //& ScreenLocker.Authenticator.Fingerprint signal reset() signal unlockSucceeded()