Tray icon refactor, now hide on termination

src/tapper/__init__.py

@@ -70,9 +70,8 @@ def start(blocking: bool = True) -> None:
         init()
     _initializer.start(_listeners)
 
-    # If tray icon is on, it will be blocking anyway, which is required for Mac compatibility.
-    # So this is for cases where it's not on.
-    # But boolean flag is there mostly for testing.
+    # Should be blocking for normal usage, flag is for testing.
+    # If tray icon is on, it will be blocking anyway.
     if blocking:
         while True:
             _time.sleep(1000000)

src/tapper/boot/initializer.py

@@ -147,5 +147,5 @@ def start(listeners: list[SignalListener]) -> None:
         controller._start()
     for listener in listeners:
         listener.start()
-    if config.tray_icon:  # this is blocking
+    if config.tray_icon and config.os != "darwin":  # No tray for MacOS
         tray_icon.create()

src/tapper/boot/tray_icon.py

@@ -1,3 +1,4 @@
+import atexit
 import os
 from typing import Any
 
@@ -28,6 +29,8 @@ def create() -> None:
 
     stray = pystray.Icon("tapper", logo, menu=make_menu())
 
-    # this is blocking. Not running in separate thread for Mac compatibility
-    # https://pystray.readthedocs.io/en/latest/usage.html
-    stray.run()
+    @atexit.register
+    def remove_stray() -> None:
+        stray.visible = False
+
+    stray.run_detached()

src/tapper/config.py

@@ -46,7 +46,10 @@
 """
 
 tray_icon = True
-"""Icon in bottom right in your task bar lets you know tapper is running and allows control."""
+"""
+Icon in bottom right in your task bar lets you know tapper is running and allows control.
+Not implemented for MacOS.
+"""
 
 """
 ------------------------------------

src/tapper/helper/controls.py

@@ -1,3 +1,4 @@
+import atexit
 import os
 import signal
 import subprocess
@@ -20,4 +21,5 @@ def terminate() -> None:
 
 
 def _terminate() -> None:
+    atexit._run_exitfuncs()
     os.kill(os.getpid(), signal.SIGINT)