lock: add placeholder + manual focus

2 files changed, 102 insertions, 56 deletions

diff --git a/modules/lock/Center.qml b/modules/lock/Center.qml
index 9610da2..bcc5130 100644
--- a/modules/lock/Center.qml
+++ b/modules/lock/Center.qml
@@ -110,6 +110,15 @@ ColumnLayout {
 
         Keys.onPressed: event => root.lock.pam.handleKey(event)
 
+        StateLayer {
+            hoverEnabled: false
+            cursorShape: Qt.IBeamCursor
+
+            function onClicked(): void {
+                parent.forceActiveFocus();
+            }
+        }
+
         RowLayout {
             id: input
 
@@ -122,58 +131,81 @@ ColumnLayout {
                 text: "lock"
             }
 
-            ListView {
-                id: passwordList
-
+            Item {
                 Layout.fillWidth: true
-                implicitHeight: Appearance.font.size.normal
+                Layout.fillHeight: true
 
-                orientation: Qt.Horizontal
-                clip: true
-                spacing: Appearance.spacing.small / 2
-                highlightRangeMode: ListView.StrictlyEnforceRange
-                preferredHighlightBegin: 0
-                preferredHighlightEnd: count ? width - implicitHeight * 2 : 0
-                currentIndex: count - 1
+                ListView {
+                    id: passwordList
 
-                model: ScriptModel {
-                    values: root.lock.pam.buffer
-                }
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    anchors.verticalCenter: parent.verticalCenter
+                    implicitHeight: Appearance.font.size.normal
 
-                delegate: StyledRect {
-                    implicitWidth: implicitHeight
-                    implicitHeight: passwordList.implicitHeight
+                    orientation: Qt.Horizontal
+                    clip: true
+                    interactive: false
+                    spacing: Appearance.spacing.small / 2
+                    highlightRangeMode: ListView.StrictlyEnforceRange
+                    preferredHighlightBegin: 0
+                    preferredHighlightEnd: count ? width - implicitHeight * 2 : 0
+                    currentIndex: count - 1
 
-                    color: Colours.palette.m3onSurface
-                    radius: Appearance.rounding.small / 2
-                }
+                    model: ScriptModel {
+                        values: root.lock.pam.buffer
+                    }
+
+                    delegate: StyledRect {
+                        implicitWidth: implicitHeight
+                        implicitHeight: passwordList.implicitHeight
 
-                add: Transition {
-                    Anim {
-                        property: "scale"
-                        from: 0
-                        to: 1
-                        duration: Appearance.anim.durations.expressiveFastSpatial
-                        easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial
+                        color: Colours.palette.m3onSurface
+                        radius: Appearance.rounding.small / 2
+                    }
+
+                    add: Transition {
+                        Anim {
+                            property: "scale"
+                            from: 0
+                            to: 1
+                            duration: Appearance.anim.durations.expressiveFastSpatial
+                            easing.bezierCurve: Appearance.anim.curves.expressiveFastSpatial
+                        }
                     }
-                }
 
-                remove: Transition {
-                    Anim {
-                        property: "scale"
-                        to: 0.5
+                    remove: Transition {
+                        Anim {
+                            property: "scale"
+                            to: 0.5
+                        }
+                        Anim {
+                            property: "opacity"
+                            to: 0
+                        }
                     }
-                    Anim {
-                        property: "opacity"
-                        to: 0
+
+                    highlightFollowsCurrentItem: false
+                    highlight: Item {
+                        x: passwordList.currentItem?.x ?? 0
+
+                        Behavior on x {
+                            Anim {}
+                        }
                     }
                 }
 
-                highlightFollowsCurrentItem: false
-                highlight: Item {
-                    x: passwordList.currentItem?.x ?? 0
+                StyledText {
+                    anchors.centerIn: parent
+
+                    text: qsTr("Enter your password")
+                    color: Colours.palette.m3outline
+                    font.pointSize: Appearance.font.size.normal
+                    font.family: Appearance.font.family.mono
+
+                    opacity: root.lock.pam.buffer ? 0 : 1
 
-                    Behavior on x {
+                    Behavior on opacity {
                         Anim {}
                     }
                 }
diff --git a/modules/lock/Pam.qml b/modules/lock/Pam.qml
index 44e8671..7863603 100644
--- a/modules/lock/Pam.qml
+++ b/modules/lock/Pam.qml
@@ -1,8 +1,9 @@
+import Quickshell
 import Quickshell.Wayland
 import Quickshell.Services.Pam
 import QtQuick
 
-PamContext {
+Scope {
     id: root
 
     required property WlSessionLock lock
@@ -11,11 +12,11 @@ PamContext {
     property string buffer: ""
 
     function handleKey(event: KeyEvent): void {
-        if (active)
+        if (passwd.active)
             return;
 
         if (event.key === Qt.Key_Enter || event.key === Qt.Key_Return) {
-            start();
+            passwd.start();
         } else if (event.key === Qt.Key_Backspace) {
             if (event.modifiers & Qt.ControlModifier) {
                 buffer = "";
@@ -28,23 +29,36 @@ PamContext {
         }
     }
 
-    onResponseRequiredChanged: {
-        if (!responseRequired)
-            return;
+    PamContext {
+        id: passwd
+
+        onResponseRequiredChanged: {
+            if (!responseRequired)
+                return;
+
+            respond(root.buffer);
+            root.buffer = "";
+        }
 
-        respond(buffer);
-        buffer = "";
+        onCompleted: res => {
+            if (res === PamResult.Success)
+                return root.lock.unlock();
+
+            if (res === PamResult.Error)
+                root.state = "error";
+            else if (res === PamResult.MaxTries)
+                root.state = "max";
+            else if (res === PamResult.Failed)
+                root.state = "fail";
+
+            stateReset.restart();
+        }
     }
 
-    onCompleted: res => {
-        if (res === PamResult.Success)
-            return lock.unlock();
+    Timer {
+        id: stateReset
 
-        if (res === PamResult.Error)
-            state = "error";
-        else if (res === PamResult.MaxTries)
-            state = "max";
-        else if (res === PamResult.Failed)
-            state = "fail";
+        interval: 4000
+        onTriggered: root.state = "none"
     }
 }