mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-08-02 03:28:28 -04:00
lock: avoid lock surface churn
related #2885
port 1.5
(cherry picked from commit 30d9a34011)
This commit is contained in:
@@ -211,10 +211,7 @@ Scope {
|
||||
function onSessionResumed() {
|
||||
if (!shouldLock || sessionLock.locked)
|
||||
return;
|
||||
log.warn("Session lock dead after resume - re-locking");
|
||||
resetLockRetry();
|
||||
lockRetryPending = true;
|
||||
lockRetryPending = false;
|
||||
resumeRelockTimer.restart();
|
||||
}
|
||||
|
||||
function onLoginctlStateChanged() {
|
||||
@@ -346,6 +343,8 @@ Scope {
|
||||
function onLockedChanged() {
|
||||
if (sessionLock.locked)
|
||||
return;
|
||||
if (shouldLock && (IdleService.monitorsOff || lockPowerOffArmed || IdleService.lockPowerOffRequested))
|
||||
return;
|
||||
lockWakeAllowed = false;
|
||||
resetPowerOffFade();
|
||||
if (IdleService.monitorsOff && powerOffOnLock) {
|
||||
@@ -430,6 +429,22 @@ Scope {
|
||||
onTriggered: root.lockRetryPending = false
|
||||
}
|
||||
|
||||
Timer {
|
||||
id: resumeRelockTimer
|
||||
interval: 1000
|
||||
repeat: false
|
||||
onTriggered: {
|
||||
if (!root.shouldLock || sessionLock.locked)
|
||||
return;
|
||||
if (IdleService.monitorsOff || root.lockPowerOffArmed || IdleService.lockPowerOffRequested)
|
||||
return;
|
||||
root.log.warn("Session lock dead after resume - re-locking");
|
||||
root.resetLockRetry();
|
||||
root.lockRetryPending = true;
|
||||
root.lockRetryPending = false;
|
||||
}
|
||||
}
|
||||
|
||||
Timer {
|
||||
id: dpmsReapplyTimer
|
||||
interval: 100
|
||||
|
||||
Reference in New Issue
Block a user