Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit e4212f18 authored by David Edmundson's avatar David Edmundson

[sddm-theme] Don't handle enter key when blurred

Summary:
Meaning pressing enter just wakes up the display.
Behaviour now matches lock screen.

BUG: 402957
Test Plan: Ran SDDM

Reviewers: #plasma, ngraham

Reviewed By: ngraham

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D17997
parent ce5f209b
......@@ -7,12 +7,13 @@ import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
SessionManagementScreen {
id: root
property Item mainPasswordBox: passwordBox
property bool showUsernamePrompt: !showUserList
property string lastUserName
property bool loginScreenUiVisible: false
//the y position that should be ensured visible when the on screen keyboard is visible
property int visibleBoundary: mapFromItem(loginButton, 0, 0).y
......@@ -50,7 +51,10 @@ SessionManagementScreen {
focus: showUsernamePrompt && !lastUserName //if there's a username prompt it gets focus first, otherwise password does
placeholderText: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Username")
onAccepted: passwordBox.forceActiveFocus()
onAccepted:
if (root.loginScreenUiVisible) {
passwordBox.forceActiveFocus()
}
}
PlasmaComponents.TextField {
......@@ -62,7 +66,11 @@ SessionManagementScreen {
echoMode: TextInput.Password
revealPasswordButtonShown: true
onAccepted: startLogin()
onAccepted: {
if (root.loginScreenUiVisible) {
startLogin();
}
}
Keys.onEscapePressed: {
mainStack.currentItem.forceActiveFocus();
......
......@@ -147,6 +147,7 @@ PlasmaCore.ColorScope {
initialItem: Login {
id: userListComponent
userListModel: userModel
loginScreenUiVisible: loginScreenRoot.uiVisible
userListCurrentIndex: userModel.lastIndex >= 0 ? userModel.lastIndex : 0
lastUserName: userModel.lastUser
showUserList: {
......@@ -332,6 +333,7 @@ PlasmaCore.ColorScope {
Login {
showUsernamePrompt: true
notificationMessage: root.notificationMessage
loginScreenUiVisible: loginScreenRoot.uiVisible
userListModel: QtObject {
property string name: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Log in as a different user")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment