Merge branch 'main' into main

dots/.config/quickshell/ii/modules/lock/LockSurface.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import Qt5Compat.GraphicalEffects
 import Quickshell.Services.UPower
 import qs
 import qs.services
@@ -7,6 +8,7 @@ import qs.modules.common
 import qs.modules.common.widgets
 import qs.modules.common.functions
 import qs.modules.bar as Bar
+import Quickshell
 import Quickshell.Services.SystemTray
 
 MouseArea {
@@ -98,6 +100,23 @@ MouseArea {
         scale: root.toolbarScale
         opacity: root.toolbarOpacity
 
+        // Fingerprint
+        Loader {
+            Layout.leftMargin: 10
+            Layout.rightMargin: 6
+            Layout.alignment: Qt.AlignVCenter
+            active: root.context.fingerprintsConfigured
+            visible: active
+
+            sourceComponent: MaterialSymbol {
+                id: fingerprintIcon
+                fill: 1
+                text: "fingerprint"
+                iconSize: Appearance.font.pixelSize.hugeass
+                color: Appearance.colors.colOnSurfaceVariant
+            }
+        }
+
         ToolbarTextField {
             id: passwordBox
             placeholderText: GlobalStates.screenUnlockFailed ? Translation.tr("Incorrect password") : Translation.tr("Enter password")
@@ -124,7 +143,17 @@ MouseArea {
             Keys.onPressed: event => {
                 root.context.resetClearTimer();
             }
+            
+            layer.enabled: true
+            layer.effect: OpacityMask {
+                maskSource: Rectangle {
+                    width: passwordBox.width - 8
+                    height: passwordBox.height
+                    radius: height / 2
+                }
+            }
 
+            // Shake when wrong password
             SequentialAnimation {
                 id: wrongPasswordShakeAnim
                 NumberAnimation { target: passwordBox; property: "x"; to: -30; duration: 50 }
@@ -139,6 +168,17 @@ MouseArea {
                     if (GlobalStates.screenUnlockFailed) wrongPasswordShakeAnim.restart();
                 }
             }
+
+            // We're drawing dots manually
+            color: ColorUtils.transparentize(Appearance.colors.colOnLayer1)
+            PasswordChars {
+                anchors {
+                    fill: parent
+                    leftMargin: passwordBox.padding
+                    rightMargin: passwordBox.padding
+                }
+                length: root.context.currentText.length
+            }
         }
 
         ToolbarButton {