Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-08-01 19:18:28 -04:00
Code Packages Releases Activity

lock: add blinking cursor for text input

Browse Source 
fixes #2316
This commit is contained in:
bbedward
2026-07-02 15:20:11 -04:00
parent e423e17807
commit 2663bcd96c
3 changed files with 101 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Modules/Lock/LockScreenContent.qml
+62 -4
View File
@@ -846,6 +846,13 @@ Item {
cursorPosition -= 1;
}
function deleteForward() {
clampCursorPosition();
if (cursorPosition === text.length)
return;
text = text.slice(0, cursorPosition) + text.slice(cursorPosition + 1);
}
function isPrintableText(value) {
if (value.length === 0)
return false;
@@ -915,16 +922,38 @@ Item {
return;
}
if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
switch (event.key) {
case Qt.Key_Return:
case Qt.Key_Enter:
accepted();
event.accepted = true;
return;
}
if (event.key === Qt.Key_Backspace) {
case Qt.Key_Backspace:
backspace();
event.accepted = true;
return;
case Qt.Key_Delete:
deleteForward();
event.accepted = true;
return;
case Qt.Key_Left:
clampCursorPosition();
cursorPosition = Math.max(0, cursorPosition - 1);
event.accepted = true;
return;
case Qt.Key_Right:
clampCursorPosition();
cursorPosition = Math.min(text.length, cursorPosition + 1);
event.accepted = true;
return;
case Qt.Key_Home:
cursorPosition = 0;
event.accepted = true;
return;
case Qt.Key_End:
cursorPosition = text.length;
event.accepted = true;
return;
}
if (isPrintableText(event.text)) {
@@ -1028,6 +1057,8 @@ Item {
}
StyledText {
id: passwordDisplay
anchors.left: lockIconContainer.right
anchors.leftMargin: Theme.spacingM
anchors.right: (revealButton.visible ? revealButton.left : (virtualKeyboardButton.visible ? virtualKeyboardButton.left : (securityKeyButton.visible ? securityKeyButton.left : (enterButton.visible ? enterButton.left : (loadingSpinner.visible ? loadingSpinner.left : parent.right)))))
@@ -1057,6 +1088,33 @@ Item {
}
}
TextMetrics {
id: passwordCursorMetrics
font: passwordDisplay.font
text: passwordDisplay.text.slice(0, passwordField.cursorPosition)
}
DankTextCursor {
id: passwordCursor
x: passwordDisplay.x + passwordCursorMetrics.advanceWidth + Math.min(0, passwordDisplay.width - passwordDisplay.implicitWidth)
anchors.verticalCenter: parent.verticalCenter
height: passwordDisplay.font.pixelSize + 4
shown: !demoMode && passwordField.activeFocus && !pam.passwd.active && !pam.u2fPending && !root.unlocking
Connections {
target: passwordField
function onCursorPositionChanged() {
passwordCursor.resetBlink();
}
function onTextChanged() {
passwordCursor.resetBlink();
}
}
}
DankActionButton {
id: revealButton
quickshell/Modules/Notepad/NotepadTextEditor.qml
+8 -17
View File
@@ -598,29 +598,20 @@ Column {
topPadding: Theme.spacingM
rightPadding: Theme.spacingM
bottomPadding: Theme.spacingM
cursorDelegate: Rectangle {
cursorDelegate: DankTextCursor {
id: notepadCursor
width: 1.5
radius: 1
color: Theme.surfaceText
x: textArea.cursorRectangle.x
y: textArea.cursorRectangle.y
height: textArea.cursorRectangle.height
opacity: 1.0
shown: textArea.cursorVisible
SequentialAnimation on opacity {
running: textArea.activeFocus
loops: Animation.Infinite
OpacityAnimator {
from: 1.0
to: 0.0
duration: 650
easing.type: Easing.InOutQuad
}
OpacityAnimator {
from: 0.0
to: 1.0
duration: 650
easing.type: Easing.InOutQuad
Connections {
target: textArea
function onCursorPositionChanged() {
notepadCursor.resetBlink();
}
}
}