Always lock

Author: andydotxyz

desk.go

@@ -27,7 +27,7 @@ type Desktop interface {
 	SetDesktop(int)
 
 	DelayScreensaver()
-	TriggerScreensaver(bool)
+	TriggerScreensaver()
 }
 
 var instance Desktop

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()
 		})
 }
 

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 {

internal/ui/screensaver.go

@@ -21,15 +21,15 @@ 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() {
 		s.Label = "(clock)"
 	} 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

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() {}