Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-06-26 21:15:18 -04:00
Code Packages Releases Activity

greeter: fix single user artifact

Browse Source
This commit is contained in:
bbedward
2026-06-25 13:44:58 -04:00
parent fd65a8cea9
commit d1f833fbbb
1 changed files with 14 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Modules/Greetd/GreeterContent.qml
+14 -43
View File
@@ -71,9 +71,13 @@ Item {
readonly property bool greeterPamHasU2f: greeterPamStackHasModule("pam_u2f") readonly property bool greeterPamHasU2f: greeterPamStackHasModule("pam_u2f")
readonly property bool greeterExternalAuthAvailable: (greeterPamHasFprint && GreetdSettings.greeterEnableFprint) || (greeterPamHasU2f && GreetdSettings.greeterEnableU2f) readonly property bool greeterExternalAuthAvailable: (greeterPamHasFprint && GreetdSettings.greeterEnableFprint) || (greeterPamHasU2f && GreetdSettings.greeterEnableU2f)
readonly property bool greeterPamHasExternalAuth: greeterPamHasFprint || greeterPamHasU2f readonly property bool greeterPamHasExternalAuth: greeterPamHasFprint || greeterPamHasU2f
readonly property bool autoLoginAvailable: GreetdSettings.rememberLastUser && GreetdSettings.rememberLastSession
readonly property bool multipleUsersAvailable: GreeterUsersService.loaded && GreeterUsersService.users.length > 1 readonly property bool multipleUsersAvailable: GreeterUsersService.loaded && GreeterUsersService.users.length > 1
readonly property bool showUserPicker: multipleUsersAvailable && !GreeterState.showPasswordInput && !manualUsernameEntry // Single-user systems get the picker too when auto-login is available, so the
readonly property bool showAccountSwitchLink: multipleUsersAvailable && manualUsernameEntry && !GreeterState.showPasswordInput && !GreeterState.unlocking // auto-login toggle lives inside the dropdown instead of floating on its own.
readonly property bool pickerAvailable: multipleUsersAvailable || (GreeterUsersService.loaded && GreeterUsersService.users.length === 1 && autoLoginAvailable)
readonly property bool showUserPicker: pickerAvailable && !GreeterState.showPasswordInput && !manualUsernameEntry
readonly property bool showAccountSwitchLink: pickerAvailable && manualUsernameEntry && !GreeterState.showPasswordInput && !GreeterState.unlocking
readonly property int userPickerMaxHeight: Math.min(400, Math.max(120, height * 0.35)) readonly property int userPickerMaxHeight: Math.min(400, Math.max(120, height * 0.35))
property bool userListOpen: false property bool userListOpen: false
property bool manualUsernameEntry: false property bool manualUsernameEntry: false
@@ -467,7 +471,7 @@ Item {
} }
function enterManualUsernameEntry() { function enterManualUsernameEntry() {
if (!root.multipleUsersAvailable || GreeterState.showPasswordInput) if (!root.pickerAvailable || GreeterState.showPasswordInput)
return; return;
root.manualUsernameEntry = true; root.manualUsernameEntry = true;
root.userListOpen = false; root.userListOpen = false;
@@ -480,7 +484,7 @@ Item {
} }
function returnToUserListFromManualEntry() { function returnToUserListFromManualEntry() {
if (!root.multipleUsersAvailable) if (!root.pickerAvailable)
return; return;
root.manualUsernameEntry = false; root.manualUsernameEntry = false;
root.userListOpen = true; root.userListOpen = true;
@@ -491,7 +495,7 @@ Item {
} }
function returnToUserPicker() { function returnToUserPicker() {
if (!root.multipleUsersAvailable || GreeterState.unlocking) if (!root.pickerAvailable || GreeterState.unlocking)
return; return;
root.manualUsernameEntry = false; root.manualUsernameEntry = false;
root.skipAutoSelectUser = true; root.skipAutoSelectUser = true;
@@ -1025,7 +1029,7 @@ Item {
Item { Item {
Layout.preferredWidth: 60 Layout.preferredWidth: 60
Layout.preferredHeight: 60 Layout.preferredHeight: 60
visible: GreetdSettings.lockScreenShowProfileImage || root.multipleUsersAvailable visible: GreetdSettings.lockScreenShowProfileImage || root.pickerAvailable
DankCircularImage { DankCircularImage {
anchors.fill: parent anchors.fill: parent
@@ -1051,7 +1055,7 @@ Item {
color: "transparent" color: "transparent"
border.color: Theme.primary border.color: Theme.primary
border.width: (avatarPickerArea.containsMouse || root.userListOpen) && !GreeterState.showPasswordInput ? 2 : 0 border.width: (avatarPickerArea.containsMouse || root.userListOpen) && !GreeterState.showPasswordInput ? 2 : 0
visible: root.multipleUsersAvailable visible: root.pickerAvailable
Behavior on border.width { Behavior on border.width {
NumberAnimation { NumberAnimation {
duration: Theme.shortDuration duration: Theme.shortDuration
@@ -1065,7 +1069,7 @@ Item {
anchors.fill: parent anchors.fill: parent
radius: width / 2 radius: width / 2
color: Qt.rgba(0, 0, 0, 0.55) color: Qt.rgba(0, 0, 0, 0.55)
opacity: (root.multipleUsersAvailable && GreeterState.showPasswordInput && avatarPickerArea.containsMouse) ? 1 : 0 opacity: (root.pickerAvailable && GreeterState.showPasswordInput && avatarPickerArea.containsMouse) ? 1 : 0
visible: opacity > 0 visible: opacity > 0
Behavior on opacity { Behavior on opacity {
@@ -1087,7 +1091,7 @@ Item {
id: avatarPickerArea id: avatarPickerArea
anchors.fill: parent anchors.fill: parent
visible: root.multipleUsersAvailable visible: root.pickerAvailable
hoverEnabled: true hoverEnabled: true
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
onClicked: { onClicked: {
@@ -1124,7 +1128,7 @@ Item {
maxExpandedHeight: root.userPickerMaxHeight maxExpandedHeight: root.userPickerMaxHeight
visible: root.showUserPicker && !GreeterState.showPasswordInput visible: root.showUserPicker && !GreeterState.showPasswordInput
expanded: root.userListOpen expanded: root.userListOpen
autoLoginVisible: GreetdSettings.rememberLastUser && GreetdSettings.rememberLastSession autoLoginVisible: root.autoLoginAvailable
autoLoginChecked: root.autoLoginOnSuccess autoLoginChecked: root.autoLoginOnSuccess
manualEntryVisible: true manualEntryVisible: true
onUserSelected: username => root.selectUser(username, false) onUserSelected: username => root.selectUser(username, false)
@@ -1420,39 +1424,6 @@ Item {
} }
} }
} }
// Single-user auto-login toggle: its only home, since there is no picker to host it.
// Multi-user switching lives on the avatar hover; multi-user auto-login lives in the picker.
// Height stays reserved during unlocking (fade only) so the centered column doesn't jump.
Item {
id: passwordActions
readonly property bool autoLoginAvailable: GreetdSettings.rememberLastUser && GreetdSettings.rememberLastSession
readonly property bool showAutoLoginToggle: !root.multipleUsersAvailable && autoLoginAvailable
Layout.fillWidth: true
Layout.topMargin: Theme.spacingXS
Layout.preferredHeight: visible ? 32 : 0
visible: GreeterState.showPasswordInput && showAutoLoginToggle
opacity: GreeterState.unlocking ? 0 : 1
Behavior on opacity {
NumberAnimation {
duration: Theme.shortDuration
easing.type: Theme.standardEasing
}
}
DankActionButton {
anchors.centerIn: parent
iconName: root.autoLoginOnSuccess ? "check_box" : "check_box_outline_blank"
iconSize: 18
buttonSize: 32
iconColor: root.autoLoginOnSuccess ? Theme.primary : Qt.rgba(1, 1, 1, 0.55)
tooltipText: I18n.tr("Auto-login")
onClicked: root.autoLoginOnSuccess = !root.autoLoginOnSuccess
}
}
} }
} }