diff --git a/desk.go b/desk.go index 2e89b2c7..64bf63d5 100644 --- a/desk.go +++ b/desk.go @@ -27,7 +27,7 @@ type Desktop interface { SetDesktop(int) DelayScreensaver() - TriggerScreensaver(bool) + TriggerScreensaver() } var instance Desktop diff --git a/internal/ui/desk.go b/internal/ui/desk.go index 46ba484a..49960324 100644 --- a/internal/ui/desk.go +++ b/internal/ui/desk.go @@ -360,7 +360,7 @@ func (l *desktop) registerShortcuts() { l.calculator) l.AddShortcut(fynedesk.NewShortcut("Lock screen", fyne.KeyL, fynedesk.UserModifier), func() { - l.TriggerScreensaver(true) + l.TriggerScreensaver() }) } diff --git a/internal/ui/menu.go b/internal/ui/menu.go index f530b46e..5b17b75e 100644 --- a/internal/ui/menu.go +++ b/internal/ui/menu.go @@ -113,7 +113,7 @@ func (w *widgetPanel) showAccountMenu(_ fyne.CanvasObject) { w2.Close() go func() { time.Sleep(time.Millisecond * 300) - w.desk.TriggerScreensaver(true) + w.desk.TriggerScreensaver() }() }}) if !isEmbed { diff --git a/internal/ui/screensaver.go b/internal/ui/screensaver.go index 863dfb28..fc640612 100644 --- a/internal/ui/screensaver.go +++ b/internal/ui/screensaver.go @@ -21,7 +21,7 @@ func (l *desktop) startXscreensaver() { } } -func (l *desktop) TriggerScreensaver(lock bool) { +func (l *desktop) TriggerScreensaver() { s := saver.NewScreenSaver(nil) s.ClockFormat = l.settings.ClockFormatting() if l.settings.ScreenSaverClock() { @@ -29,7 +29,7 @@ func (l *desktop) TriggerScreensaver(lock bool) { } else { s.Label = l.settings.ScreenSaverLabel() } - s.Lock = lock + s.Lock = true go l.wm.ShowScreensaver(s) } @@ -50,7 +50,7 @@ func (l *desktop) watchScreenActivity() { if !idle { idle = true - l.TriggerScreensaver(false) + l.TriggerScreensaver() } } else { idle = false diff --git a/test/desktop.go b/test/desktop.go index 4fb79bb1..9990286d 100644 --- a/test/desktop.go +++ b/test/desktop.go @@ -123,4 +123,4 @@ func (td *Desktop) WindowManager() fynedesk.WindowManager { func (td *Desktop) DelayScreensaver() {} -func (td *Desktop) TriggerScreensaver(bool) {} +func (td *Desktop) TriggerScreensaver() {}