Skip to content

fix: switch user login password input unresponsive #1020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
deepin-wm wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: switch user login password input unresponsive #1020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/greeter/greeterproxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ void GreeterProxy::setShowShutdownView(bool show) {
void GreeterProxy::setLock(bool isLocked)
{
if (isLocked && !m_isLocked) {
// m_isLocked must be set before m_lockScreen->lock() to prevent re-entry
m_isLocked = true;
if (m_lockScreen && !m_lockScreen->isVisible())
m_lockScreen->lock();
Expand Down Expand Up @@ -242,6 +243,7 @@ void GreeterProxy::lock()
}
qCInfo(lcTlGreeter) << "Locking user" << session->username() << "with session id" << session->id();
SocketWriter(m_socket) << quint32(GreeterMessages::Lock) << session->id();
setLock(true);
}

//////////////////////////////
Expand Down Expand Up @@ -347,8 +349,8 @@ void GreeterProxy::onSessionLock()
qCWarning(lcTlGreeter)
<< "Lock signal received for non-exist session id:" << id << ", ignore.";
else if (activeSession->id() != id)
qCWarning(lcTlGreeter)
<< "Lock signal received for non-active session id:" << id << ", ignore.";
qCDebug(lcTlGreeter)
<< "Lock signal received for session id:" << id << ", already locked via lock() call.";
else
QMetaObject::invokeMethod(this, [this] {
setLock(true);
Expand Down
1 change: 1 addition & 0 deletions src/plugins/lockscreen/qml/UserInput.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ Item {
passwordField.text = ''
avatar.fallbackSource = currentUser.icon
hintText.text = normalHint
Qt.callLater(function() { passwordField.forceActiveFocus() })
}

function startOtherUserMode() {
Expand Down
Loading