Improve tray menu positioning and popup

Revise tray context-menu positioning and activation handling. calculateMenuPosition() now prefers tray icon geometry, then a non-zero cursor position, and finally a screen-geometry heuristic to infer the panel edge (fixes Wayland/XWayland cursor (0,0) issues). The tray activation handler now responds to both Trigger and Context reasons, captures the anchor point, and defers menu->popup() via QTimer::singleShot(0) to avoid platform grab conflicts on Xorg; it also avoids reopening an already visible menu.

Author: ReenigneArcher

src/tray_linux.cpp

@@ -98,22 +98,62 @@ namespace {
   /**
    * @brief Calculate the best position to show the context menu.
    *
-   * Uses the tray icon geometry when available (reliable on X11/XEmbed and
-   * some SNI desktops). Falls back to the current cursor position on systems
-   * where the icon geometry cannot be determined. Qt's QMenu::popup() will
-   * adjust the final position to keep the menu fully on-screen.
+   * Priority:
+   * 1. Tray icon geometry (reliable on X11/XEmbed, sometimes on SNI).
+   * 2. Cursor position when non-zero (reliable on Xorg; on Wayland and some
+   *    XWayland configurations QCursor::pos() returns (0,0) even though the
+   *    click occurred elsewhere, so zero is treated as unavailable).
+   * 3. Screen-geometry heuristic: the panel edge is inferred from the
+   *    difference between the screen's full and available geometries.
+   *
+   * Qt's QMenu::popup() will adjust the final position to keep the menu fully
+   * on-screen, including flipping it above the anchor point when needed.
    *
    * @return The point at which to show the context menu.
    */
   QPoint calculateMenuPosition() {
     if (g_tray_icon != nullptr) {
-      const QRect iconGeometry = g_tray_icon->geometry();
-      if (iconGeometry.isValid()) {
-        // Qt's popup() will flip the menu above the icon if it would go off-screen.
-        return iconGeometry.bottomLeft();
+      const QRect iconGeo = g_tray_icon->geometry();
+      if (iconGeo.isValid()) {
+        return iconGeo.bottomLeft();
+      }
+    }
+
+    // QCursor::pos() returns (0, 0) on Wayland and some XWayland setups because
+    // the compositor does not expose the global cursor position to applications.
+    // Use it only when it reports a non-zero position.
+    const QPoint cursor = QCursor::pos();
+    if (!cursor.isNull()) {
+      return cursor;
+    }
+
+    // Wayland fallback: infer the panel edge from available vs full screen geometry
+    // and anchor the menu to the corner of that edge. Qt's popup() will ensure the
+    // menu is kept fully on-screen (flipping above/below the anchor as needed).
+    QScreen *screen = QGuiApplication::primaryScreen();
+    if (screen != nullptr) {
+      const QRect full = screen->geometry();
+      const QRect avail = screen->availableGeometry();
+      if (avail.top() > full.top()) {
+        // Panel at top (e.g. GNOME default): anchor below the panel at the right edge.
+        return QPoint(avail.right(), avail.top());
+      }
+      if (avail.bottom() < full.bottom()) {
+        // Panel at bottom (e.g. KDE Plasma default): anchor at the bottom-right edge;
+        // popup() will flip the menu upward automatically.
+        return QPoint(avail.right(), avail.bottom());
+      }
+      if (avail.left() > full.left()) {
+        // Panel on the left: anchor at the panel's right edge.
+        return QPoint(avail.left(), avail.bottom());
+      }
+      if (avail.right() < full.right()) {
+        // Panel on the right: anchor at the panel's left edge.
+        return QPoint(avail.right(), avail.bottom());
       }
     }
-    return QCursor::pos();
+
+    return cursor;
   }
 
   void close_notification() {
@@ -218,19 +258,27 @@ extern "C" {
       return -1;
     }
 
-    // Show the context menu on the default trigger (clicked).
-    // QSystemTrayIcon::setContextMenu only handles right-click on X11/XEmbed;
-    // SNI-based desktops may not show the menu at all without this explicit connection.
-    // The menu is positioned using the tray icon geometry rather than the cursor position,
-    // which is unreliable on Wayland.
+    // Show the context menu on left-click (Trigger) and right-click (Context).
+    // On X11/XEmbed, setContextMenu handles right-click natively. On SNI-based
+    // desktops (GNOME Wayland with AppIndicators) the shell may emit activated(Context)
+    // instead, so we handle it here explicitly as a fallback.
+    // The menu position is captured immediately (cursor pos changes after the event),
+    // then the popup is deferred to the next event-loop iteration via QTimer::singleShot.
+    // Deferring ensures the platform grab from the tray click (X11 button grab) is
+    // released before the menu creates its own grab, which fixes menu dismissal on Xorg.
+    // The isVisible() guard prevents a duplicate popup when Qt already showed the menu
+    // natively (e.g. via setContextMenu on right-click).
     QObject::connect(g_tray_icon, &QSystemTrayIcon::activated, [](QSystemTrayIcon::ActivationReason reason) {
-      if (reason == QSystemTrayIcon::Trigger) {
-        if (g_tray_icon != nullptr) {
-          QMenu *menu = g_tray_icon->contextMenu();
-          if (menu != nullptr) {
-            menu->popup(calculateMenuPosition());
+      if (reason == QSystemTrayIcon::Trigger || reason == QSystemTrayIcon::Context) {
+        const QPoint pos = calculateMenuPosition();
+        QTimer::singleShot(0, g_tray_icon, [pos]() {
+          if (g_tray_icon != nullptr) {
+            QMenu *menu = g_tray_icon->contextMenu();
+            if (menu != nullptr && !menu->isVisible()) {
+              menu->popup(pos);
+            }
           }
-        }
+        });
       }
     });