Skip to content

Commit

Permalink
Fix lint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
andydotxyz committed Jan 26, 2025
1 parent b2d6c59 commit 403a6b3
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 12 deletions.
4 changes: 2 additions & 2 deletions desk.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ type Desktop interface {
Desktop() int
SetDesktop(int)

DelayScreensaver()
TriggerScreensaver()
DelayScreenSaver()
TriggerScreenSaver()
}

var instance Desktop
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/desk.go
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ func (l *desktop) registerShortcuts() {
l.calculator)
l.AddShortcut(fynedesk.NewShortcut("Lock screen", fyne.KeyL, fynedesk.UserModifier),
func() {
l.TriggerScreensaver()
l.TriggerScreenSaver()
})
}

Expand Down
2 changes: 1 addition & 1 deletion internal/ui/embed_wm.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func (e *embededWM) ShowScreensaver(s *saver.ScreenSaver) {
func (e *embededWM) setWindow(win fyne.Window) fyne.CanvasObject {
e.root = win

return newSaverMonitor(fynedesk.Instance().DelayScreensaver)
return newSaverMonitor(fynedesk.Instance().DelayScreenSaver)
}

type saverMonitor struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/ui/menu.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (w *widgetPanel) showAccountMenu(_ fyne.CanvasObject) {
w2.Close()
go func() {
time.Sleep(time.Millisecond * 300)
w.desk.TriggerScreensaver()
w.desk.TriggerScreenSaver()
}()
}})
if !isEmbed {
Expand Down
6 changes: 3 additions & 3 deletions internal/ui/screensaver.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func (l *desktop) startXscreensaver() {
}
}

func (l *desktop) TriggerScreensaver() {
func (l *desktop) TriggerScreenSaver() {
s := saver.NewScreenSaver(nil)
s.ClockFormat = l.settings.ClockFormatting()
if l.settings.ScreenSaverClock() {
Expand All @@ -36,7 +36,7 @@ func (l *desktop) TriggerScreensaver() {

var lastActivity time.Time

func (l *desktop) DelayScreensaver() {
func (l *desktop) DelayScreenSaver() {
lastActivity = time.Now()
}

Expand All @@ -50,7 +50,7 @@ func (l *desktop) watchScreenActivity() {
if !idle {
idle = true

l.TriggerScreensaver()
l.TriggerScreenSaver()
}
} else {
idle = false
Expand Down
2 changes: 1 addition & 1 deletion internal/x11/wm/screensaver.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func (x *x11WM) watchScreensaver() {
}

if info.MsSinceUserInput <= 5500 {
fynedesk.Instance().DelayScreensaver()
fynedesk.Instance().DelayScreenSaver()
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions test/desktop.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ func (td *Desktop) WindowManager() fynedesk.WindowManager {
return td.wm
}

func (td *Desktop) DelayScreensaver() {}
// DelayScreenSaver is called each time the user interacts with the system.
func (td *Desktop) DelayScreenSaver() {}

func (td *Desktop) TriggerScreensaver() {}
// TriggerScreenSaver can be called to immediately show the screensaver.
func (td *Desktop) TriggerScreenSaver() {}
5 changes: 4 additions & 1 deletion test/settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,17 @@ func (s *Settings) ClockFormatting() string {
return s.clockFormatting
}

// ScreenSaverClock returns if the text on the screensaver should be a clock.
func (s *Settings) ScreenSaverClock() bool {
return true
}

// ScreenSaverLabel returns the string to use in the screensaver (if not a clock).
func (s *Settings) ScreenSaverLabel() string {
return "(clock)"
return "FyshOS"
}

// ScreenSaverType returns whether this user should use FyshOS or XScreensaver savers.
func (s *Settings) ScreenSaverType() string {
return "FyshOS"
}
Expand Down

0 comments on commit 403a6b3

Please sign in to comment.