Skip to content

fix: 解决系统触发黑屏时, 先显示锁屏再黑屏的问题 #1014

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

Merged
fly602 merged 1 commit into from
Feb 2, 2026
Merged

fix: 解决系统触发黑屏时, 先显示锁屏再黑屏的问题 #1014

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
5 changes: 3 additions & 2 deletions keybinding1/special_keycode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,10 +380,11 @@ func (m *Manager) handlePower() {
m.systemHibernateByFront()
}
case powerActionTurnOffScreen:
m.systemTurnOffScreen()
if screenBlackLock {
systemLock()
// 让性能差的机器先黑屏，再锁屏
time.AfterFunc(200*time.Microsecond, systemLock)
}
m.systemTurnOffScreen()
case powerActionShowUI:
cmd := "/usr/lib/deepin-daemon/dde-shutdown.sh"
go func() {
Expand Down
9 changes: 5 additions & 4 deletions session/power1/power_save_plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,10 +632,6 @@ func (psp *powerSavePlan) screenBlack() {
}

logger.Info("Screen full black")
if manager.ScreenBlackLock {
manager.lockWaitShow(5*time.Second, true)
}

if adjustBrightnessEnabled {
// set min brightness for all outputs
brightnessTable := make(map[string]float64)
Expand All @@ -645,6 +641,11 @@ func (psp *powerSavePlan) screenBlack() {
manager.setDisplayBrightness(brightnessTable)
}
manager.setDPMSModeOff()
if manager.ScreenBlackLock {
time.AfterFunc(200*time.Millisecond, func() {
manager.lockWaitShow(5*time.Second, true)
})
}

})
psp.addTask(taskF)
Expand Down