fix(app): quit from tray icon runs appropriate actions

joshuar · Oct 14, 2023 · 6681999 · 6681999
1 parent 02b3ba9
commit 6681999
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/internal/app/app.go b/internal/app/app.go
@@ -44,6 +44,7 @@ type App struct {
 	tray              fyne.Window
 	Name, Version     string
 	showNotifications bool
+	Done              chan struct{}
 }
 
 func New() *App {
@@ -52,12 +53,12 @@ func New() *App {
 		Name:              Name,
 		Version:           Version,
 		showNotifications: false,
+		Done:              make(chan struct{}),
 	}
 }
 
 func (a *App) Run() {
 	appCtx, cancelfunc := context.WithCancel(context.Background())
-	doneCh := make(chan struct{})
 	handler := handler.NewHandler()
 	correctionsList = corrections.NewCorrections()
 	if err := createDir(configPath); err != nil {
@@ -113,10 +114,10 @@ func (a *App) Run() {
 	go func() {
 		<-c
 		log.Debug().Msg("Ctrl-C pressed.")
-		close(doneCh)
+		close(a.Done)
 	}()
 	go func() {
-		<-doneCh
+		<-a.Done
 		stats.Save()
 		log.Debug().Msg("Agent done.")
 		os.Exit(0)
@@ -132,6 +133,10 @@ func (a *App) Run() {
 	cancelfunc()
 }
 
+func (a *App) Stop() {
+	close(a.Done)
+}
+
 func createDir(path string) error {
 	_, err := os.Stat(path)
 	if os.IsNotExist(err) {

diff --git a/internal/app/ui.go b/internal/app/ui.go
@@ -44,6 +44,10 @@ func (a *App) setupSystemTray(stats *db.Stats) {
 	a.tray = a.app.NewWindow("System Tray")
 	a.tray.SetMaster()
 	if desk, ok := a.app.(desktop.App); ok {
+		menuItemQuit := fyne.NewMenuItem("Quit", func() {
+			a.Stop()
+		})
+		menuItemQuit.IsQuit = true
 		menuItemAbout := fyne.
 			NewMenuItem("About",
 				func() {
@@ -91,7 +95,8 @@ func (a *App) setupSystemTray(stats *db.Stats) {
 			menuItemToggleNotifications,
 			menuItemToggleKeyTracker,
 			menuItemIssue,
-			menuItemFeatureRequest)
+			menuItemFeatureRequest,
+			menuItemQuit)
 		desk.SetSystemTrayMenu(menu)
 	}
 	a.tray.Hide()