zach/z-bar-qt
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

lockscreen bg blur fixes

Browse Source
This commit is contained in:
Zacharias-Brohn
2025-12-05 15:40:17 +01:00
parent dad3fa6bbf
commit 563d881d6f
5 changed files with 203 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Components/CustomText.qml
+2 -1
View File
@@ -41,7 +41,8 @@ Text {
component Anim: NumberAnimation {
target: root
property: root.animateProp
property: root.animateProp.split(",").length === 1 ? root.animateProp : ""
properties: root.animateProp.split(",").length > 1 ? root.animateProp : ""
duration: root.animateDuration / 2
easing.type: Easing.BezierSpline
}
Config/LockConf.qml
+1 -10
View File
@@ -1,14 +1,5 @@
import Quickshell.Io
JsonObject {
property bool recolourLogo: false
property bool enableFprint: true
property int maxFprintTries: 3
property Sizes sizes: Sizes {}
component Sizes: JsonObject {
property real heightMult: 0.7
property real ratio: 16 / 9
property int centerWidth: 600
}
property bool fixLockScreen: false
}
Modules/Lock/Lock.qml
+22 -1
View File
@@ -4,19 +4,38 @@ import Quickshell
import Quickshell.Wayland
import Quickshell.Hyprland
import QtQuick
import QtQuick.Effects
import qs.Config
Scope {
id: root
property alias lock: lock
property int seenOnce: 0
Timer {
interval: 500
running: true
repeat: false
onTriggered: {
if ( Config.lock.fixLockScreen ) {
Quickshell.execDetached(["hyprctl", "keyword", "misc:session_lock_xray", "true"]);
console.log("Fixed lock screen X-ray issue.");
}
}
}
WlSessionLock {
id: lock
signal unlock
signal requestLock
LockSurface {
id: lockSurface
lock: lock
pam: pam
scope: root
}
}
@@ -31,7 +50,9 @@ Scope {
description: "Lock the current session"
appid: "zshell-lock"
onPressed: {
lock.locked = true
lock.locked = true;
}
}
}
Modules/Lock/LockSurface.qml
+153 -62
View File
@@ -17,9 +17,11 @@ WlSessionLockSurface {
required property WlSessionLock lock
required property Pam pam
required property Scope scope
property string buffer
color: "transparent"
color: overlay.visible ? "black" : "transparent"
Connections {
target: root.pam
@@ -35,6 +37,18 @@ WlSessionLockSurface {
}
}
Timer {
interval: 100
running: true
repeat: false
onTriggered: {
if ( Config.lock.fixLockScreen && root.scope.seenOnce === 0 ) {
Quickshell.execDetached(["hyprctl", "keyword", "misc:session_lock_xray", "false;"]);
root.scope.seenOnce += 1;
}
}
}
TextInput {
id: hiddenInput
focus: true
@@ -51,6 +65,8 @@ WlSessionLockSurface {
ScreencopyView {
id: background
live: false
anchors.fill: parent
captureSource: root.screen
opacity: 1
@@ -69,13 +85,16 @@ WlSessionLockSurface {
// id: backgroundImage
// anchors.fill: parent
// asynchronous: true
// source: WallpaperPath.lockscreenBg
// source: root.backgroundImage
// }
Rectangle {
id: overlay
anchors.fill: parent
color: "transparent"
visible: background.hasContent
Rectangle {
id: contentBox
anchors.centerIn: parent
@@ -93,7 +112,7 @@ WlSessionLockSurface {
blurMax: 12
shadowBlur: 1
shadowColor: DynamicColors.palette.m3shadow
shadowOpacity: 0.3
shadowOpacity: 1
shadowEnabled: true
autoPaddingEnabled: true
}
@@ -104,20 +123,22 @@ WlSessionLockSurface {
width: childrenRect.width
spacing: 0
RowLayout {
Layout.alignment: Qt.AlignHCenter
Layout.bottomMargin: 16
spacing: 16
UserImage {
Layout.alignment: Qt.AlignHCenter | Qt.AlignLeft
Layout.bottomMargin: 16
Layout.preferredWidth: 128
Layout.preferredHeight: 128
}
LockTime {
Layout.alignment: Qt.AlignHCenter
Layout.bottomMargin: 8
}
CustomText {
id: supportText
Layout.alignment: Qt.AlignHCenter
Layout.bottomMargin: 24
text: "Please enter your password to unlock"
font.pixelSize: 14
font.weight: Font.Medium
color: DynamicColors.palette.m3onSurfaceVariant
}
Rectangle {
@@ -145,6 +166,124 @@ WlSessionLockSurface {
ColorAnimation { duration: 150 }
}
transform: Translate {
id: wobbleTransform
x: 0
}
SequentialAnimation {
id: wobbleAnimation
ColorAnimation {
target: inputContainer
property: "color"
to: DynamicColors.tPalette.m3onError
duration: MaterialEasing.expressiveEffectsTime
}
ParallelAnimation {
NumberAnimation {
target: wobbleTransform
property: "x"
to: -8
duration: MaterialEasing.expressiveFastSpatialTime / 4
easing.bezierCurve: MaterialEasing.expressiveFastSpatial
}
}
NumberAnimation {
target: wobbleTransform
property: "x"
to: 8
duration: MaterialEasing.expressiveFastSpatialTime / 4
easing.bezierCurve: MaterialEasing.expressiveFastSpatial
}
NumberAnimation {
target: wobbleTransform
property: "x"
to: -8
duration: MaterialEasing.expressiveFastSpatialTime / 4
easing.bezierCurve: MaterialEasing.expressiveFastSpatial
}
NumberAnimation {
target: wobbleTransform
property: "x"
to: 0
duration: MaterialEasing.expressiveFastSpatialTime / 4
easing.bezierCurve: MaterialEasing.expressiveFastSpatial
}
ColorAnimation {
target: inputContainer
property: "color"
to: DynamicColors.tPalette.m3surfaceContainerHigh
duration: MaterialEasing.expressiveEffectsTime
}
}
Connections {
target: root.pam
function onStateChanged(): void {
if (root.pam.state === "error" || root.pam.state === "fail") {
wobbleAnimation.start();
}
}
}
CustomText {
id: messageDisplay
anchors.centerIn: inputContainer
text: {
if ( root.pam.buffer.length > 0 || root.pam.passwd.active ) {
return "";
}
if (root.pam.lockMessage) {
return root.pam.lockMessage;
}
if (root.pam.state === "error") {
return "Authentication error";
}
if (root.pam.state === "fail") {
return "Invalid password";
}
if (root.pam.state === "max") {
return "Maximum attempts reached";
}
return "Enter your password";
}
visible: true
font.pointSize: 14
font.weight: Font.Medium
animate: true
Behavior on text {
SequentialAnimation {
OAnim {
target: messageDisplay
property: "opacity"
to: 0
}
PropertyAction {}
OAnim {
target: messageDisplay
property: "opacity"
to: 1
}
}
}
component OAnim: NumberAnimation {
target: messageDisplay
property: "opacity"
duration: 100
}
color: root.pam.state === "max" ? DynamicColors.palette.m3error : DynamicColors.palette.m3onSurfaceVariant
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
}
ListView {
id: charList
@@ -157,7 +296,7 @@ WlSessionLockSurface {
}
anchors.centerIn: parent
anchors.horizontalCenterOffset: implicitWidth > inputContainer.width ? -(implicitWidth - inputContainer.width) / 2 : 0
anchors.horizontalCenterOffset: implicitWidth > inputContainer.width - 20 ? -(implicitWidth - inputContainer.width + 20) / 2 : 0
implicitWidth: fullWidth
implicitHeight: 16
@@ -232,54 +371,6 @@ WlSessionLockSurface {
Anim {}
}
}
Rectangle {
anchors.fill: parent
radius: 12
color: "transparent"
border.width: 2
border.color: DynamicColors.palette.m3primary
opacity: 0
visible: hiddenInput.activeFocus
Behavior on opacity {
NumberAnimation { duration: 150 }
}
}
Component.onCompleted: {
if (hiddenInput.activeFocus) opacity = 1;
}
}
CustomText {
id: messageDisplay
Layout.alignment: Qt.AlignHCenter
Layout.topMargin: 8
text: {
if (root.pam.lockMessage) {
return root.pam.lockMessage;
}
if (root.pam.state === "error") {
return "Authentication error";
}
if (root.pam.state === "fail") {
return "Invalid password";
}
if (root.pam.state === "max") {
return "Maximum attempts reached";
}
return "";
}
visible: text.length > 0
font.pixelSize: 12
font.weight: Font.Medium
color: root.pam.state === "max" ? DynamicColors.palette.m3error : DynamicColors.palette.m3onSurfaceVariant
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
Layout.preferredWidth: 320
}
}
}
Modules/Lock/UserImage.qml
+24
View File
@@ -0,0 +1,24 @@
import Quickshell
import Quickshell.Widgets
import QtQuick
import qs.Paths
Item {
id: root
ClippingRectangle {
radius: 1000
anchors.fill: parent
Image {
id: userImage
anchors.fill: parent
sourceSize.width: parent.width
sourceSize.height: parent.height
asynchronous: true
fillMode: Image.PreserveAspectFit
source: `${Paths.home}/.face`
}
}
}