fix(tray): activate tray window also on right click (macOS)

src/gui/CMakeLists.txt

@@ -241,6 +241,7 @@ set(client_SRCS
     tray/asyncimageresponse.cpp
     tray/trayimageprovider.cpp
     tray/trayaccountmenupolicy.h
+    tray/trayactivationpolicy.h
     tray/trayaccountappsmodel.h
     tray/trayaccountappsmodel.cpp
     tray/usermodel.h

src/gui/owncloudgui.cpp

@@ -34,6 +34,7 @@
 #include "filedetails/sortedsharemodel.h"
 #include "activity/sortedactivitylistmodel.h"
 #include "activity/syncstatussummary.h"
+#include "tray/trayactivationpolicy.h"
 #include "tray/trayaccountappsmodel.h"
 #include "search/unifiedsearchresultslistmodel.h"
 #include "integration/fileactionsmodel.h"
@@ -244,7 +245,7 @@ void ownCloudGui::slotTrayClicked(QSystemTrayIcon::ActivationReason reason)
     const auto currentUser = UserModel::instance()->currentUser();
     if (reason == QSystemTrayIcon::DoubleClick && currentUser && currentUser->hasLocalFolder()) {
         currentUser->openLocalFolder();
-    } else if (reason == QSystemTrayIcon::Trigger) {
+    } else if (TrayActivationPolicy::opensPrimaryPopup(reason)) {
         if (AccountManager::instance()->accounts().isEmpty()) {
             // Without a configured account the tray icon drives the setup wizard
             // directly: open it, or bring the existing one back to front instead

src/gui/tray/trayactivationpolicy.h

@@ -0,0 +1,31 @@
+/*
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#pragma once
+
+#include <QSystemTrayIcon>
+
+namespace OCC {
+
+/** @brief Defines which tray-icon activations open the primary tray popup. */
+class TrayActivationPolicy
+{
+public:
+    /** @brief Whether the activation should open or toggle the primary tray popup. */
+    [[nodiscard]] static constexpr bool opensPrimaryPopup(const QSystemTrayIcon::ActivationReason reason)
+    {
+        if (reason == QSystemTrayIcon::Trigger) {
+            return true;
+        }
+
+#ifdef Q_OS_MACOS
+        return reason == QSystemTrayIcon::Context;
+#else
+        return false;
+#endif
+    }
+};
+
+}

test/CMakeLists.txt

@@ -102,6 +102,7 @@ nextcloud_add_test(IconUtils)
 nextcloud_add_test(NotificationSoundPlayer)
 nextcloud_add_test(SetUserStatusDialog)
 nextcloud_add_test(TrayAccountMenuPolicy)
+nextcloud_add_test(TrayActivationPolicy)
 nextcloud_add_test(UnifiedSearchListmodel)
 nextcloud_add_test(ActivityListModel)
 nextcloud_add_test(SortedActivityListModel)

test/testtrayactivationpolicy.cpp

@@ -0,0 +1,44 @@
+/*
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: CC0-1.0
+ *
+ * This software is in the public domain, furnished "as is", without technical
+ * support, and with no warranty, express or implied, as to its usefulness for
+ * any purpose.
+ */
+
+#include "tray/trayactivationpolicy.h"
+
+#include <QtTest>
+
+using namespace OCC;
+
+class TestTrayActivationPolicy : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testPrimaryClickOpensPopup()
+    {
+        QVERIFY(TrayActivationPolicy::opensPrimaryPopup(QSystemTrayIcon::Trigger));
+    }
+
+    void testContextClickBehaviorIsPlatformSpecific()
+    {
+#ifdef Q_OS_MACOS
+        QVERIFY(TrayActivationPolicy::opensPrimaryPopup(QSystemTrayIcon::Context));
+#else
+        QVERIFY(!TrayActivationPolicy::opensPrimaryPopup(QSystemTrayIcon::Context));
+#endif
+    }
+
+    void testOtherActivationsDoNotOpenPopup()
+    {
+        QVERIFY(!TrayActivationPolicy::opensPrimaryPopup(QSystemTrayIcon::Unknown));
+        QVERIFY(!TrayActivationPolicy::opensPrimaryPopup(QSystemTrayIcon::DoubleClick));
+        QVERIFY(!TrayActivationPolicy::opensPrimaryPopup(QSystemTrayIcon::MiddleClick));
+    }
+};
+
+QTEST_APPLESS_MAIN(TestTrayActivationPolicy)
+#include "testtrayactivationpolicy.moc"