Fix: make system tray show all items

fabric/system_tray/service.py

@@ -1,3 +1,4 @@
+import os
 import gi
 from loguru import logger
 from typing import NamedTuple, Literal, Any, cast
@@ -174,27 +175,38 @@ def get_preferred_icon_pixbuf(
             preferred_icon_name = icon_name
             preferred_icon_pixmap = icon_pixmap
 
-        icon_theme = self.icon_theme
+        pixbuf = preferred_icon_pixmap.as_pixbuf() if preferred_icon_pixmap else None
+        target_size = size if size is not None else 24
+
+        # If the icon name is explicitly a path, try loading it directly first
+        if not pixbuf and preferred_icon_name and os.path.isabs(preferred_icon_name):
+            try:
+                pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(
+                    preferred_icon_name, target_size, target_size
+                )
+            except GLib.Error:
+                pass
+
+        if not pixbuf and preferred_icon_name:
+            icon_theme = self.icon_theme
+            icon_theme_sizes = icon_theme.get_icon_sizes(preferred_icon_name) or []
+            lookup_size = max(icon_theme_sizes) if icon_theme_sizes else target_size
+
+            try:
+                pixbuf = icon_theme.load_icon(
+                    preferred_icon_name,
+                    lookup_size,
+                    Gtk.IconLookupFlags.FORCE_SIZE,
+                )
+            except GLib.Error:
+                if os.path.isfile(preferred_icon_name):
+                    try:
+                        pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(
+                            preferred_icon_name, target_size, target_size
+                        )
+                    except GLib.Error:
+                        pass
 
-        icon_theme_sizes: list | None = (
-            icon_theme.get_icon_sizes(preferred_icon_name)
-            if preferred_icon_name is not None
-            else None
-        )  # type: ignore
-        icon_theme_sizes = [] if not icon_theme_sizes else icon_theme_sizes
-        icon_theme_sizes.append(size if size is not None else 24)
-
-        pixbuf = (
-            preferred_icon_pixmap.as_pixbuf()
-            if preferred_icon_pixmap is not None
-            else icon_theme.load_icon(
-                preferred_icon_name,
-                max(icon_theme_sizes),
-                Gtk.IconLookupFlags.FORCE_SIZE,
-            )
-            if preferred_icon_name is not None
-            else None
-        )
         return (
             pixbuf.scale_simple(
                 size,
@@ -305,12 +317,21 @@ def activate(self, x: int, y: int) -> None:
     def secondary_activate(self, x: int, y: int) -> None:
         return self._proxy.SecondaryActivate("(ii)", x, y)
 
-    def invoke_menu_for_event(self, event: Gdk.Event) -> None:
+    def invoke_menu_for_event(
+        self, event: Gdk.Event, widget: Gtk.Widget | None = None
+    ) -> None:
         menu = self.get_menu()
-        return (
-            menu.popup_at_pointer(event)
-            if menu is not None
-            else self.context_menu_for_event(event)
+        if not menu or not menu.get_children():
+            return self.context_menu_for_event(event)
+
+        if not widget:
+            return menu.popup_at_pointer(event)
+
+        return menu.popup_at_widget(
+            widget,
+            Gdk.Gravity.SOUTH,
+            Gdk.Gravity.NORTH,
+            event,
         )
 
     def scroll(

fabric/system_tray/widgets.py

@@ -52,13 +52,13 @@ def on_clicked(self, _, event):
         match event.button:
             case 1:
                 try:
-                    self._item.activate_for_event(event)
+                    self._item.activate_for_event(event,self)
                 except Exception as e:
                     logger.warning(
                         f"[SystemTrayItem] can't activate item with name {self._item.title or self._item.identifier} ({e})"
                     )
             case 3:
-                self._item.invoke_menu_for_event(event)
+                self._item.invoke_menu_for_event(event, self)
         return
 
 
@@ -74,8 +74,10 @@ def __init__(self, icon_size: int = 24, **kwargs):
 
     def on_item_added(self, _, item_identifier: str):
         item = self._watcher.items.get(item_identifier)
-        if not item:
-            return
+        if not item or item_identifier in self._items:
+            return logger.warning(
+                f"[SystemTray] Item {item_identifier} couldn't be fetched or already exists"
+            )
 
         item_button = SystemTrayItem(item, self._icon_size)
         self.add(item_button)