synodic-client 0.0.1.dev81__tar.gz → 0.0.1.dev82__tar.gz

{synodic_client-0.0.1.dev81 → synodic_client-0.0.1.dev82}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: synodic_client
-Version: 0.0.1.dev81
+Version: 0.0.1.dev82
 Author-Email: Synodic Software <contact@synodic.software>
 License: LGPL-3.0-or-later
 Project-URL: homepage, https://github.com/synodic/synodic-client
 Project-URL: repository, https://github.com/synodic/synodic-client
 Requires-Python: <3.15,>=3.14
-Requires-Dist: pyside6>=6.10.2
+Requires-Dist: pyside6>=6.11.0
 Requires-Dist: packaging>=26.0
 Requires-Dist: porringer>=0.2.1.dev88
 Requires-Dist: qasync>=0.28.0

{synodic_client-0.0.1.dev81 → synodic_client-0.0.1.dev82}/pyproject.toml

@@ -8,14 +8,14 @@ readme = "README.md"
 dynamic = []
 requires-python = ">=3.14, <3.15"
 dependencies = [
-    "pyside6>=6.10.2",
+    "pyside6>=6.11.0",
     "packaging>=26.0",
     "porringer>=0.2.1.dev88",
     "qasync>=0.28.0",
     "velopack>=0.0.1535.dev45597",
     "typer>=0.24.1",
 ]
-version = "0.0.1.dev81"
+version = "0.0.1.dev82"
 
 [project.license]
 text = "LGPL-3.0-or-later"
@@ -36,7 +36,7 @@ build = [
 ]
 lint = [
     "ruff>=0.15.7",
-    "pyrefly>=0.57.1",
+    "pyrefly>=0.58.0",
 ]
 test = [
     "pytest>=9.0.2",

{synodic_client-0.0.1.dev81 → synodic_client-0.0.1.dev82}/synodic_client/application/screen/tray.py

@@ -4,7 +4,7 @@ import logging
 from typing import TYPE_CHECKING
 
 from PySide6.QtCore import QTimer
-from PySide6.QtGui import QAction
+from PySide6.QtGui import QAction, QCursor
 from PySide6.QtWidgets import (
     QApplication,
     QMainWindow,
@@ -126,10 +126,10 @@ class TrayScreen:
         self._menu.addSeparator()
 
         self._quit_action = QAction('Quit', self._menu)
-        self._quit_action.triggered.connect(app.quit)
+        self._quit_action.triggered.connect(self._on_quit_triggered)
         self._menu.addAction(self._quit_action)
 
-        self.tray.setContextMenu(self._menu)
+        self._menu.aboutToShow.connect(lambda: logger.debug('Tray context menu about to show'))
 
     # Maximum number of tray-visibility retries at startup.
     _TRAY_MAX_RETRIES = 5
@@ -162,12 +162,29 @@ class TrayScreen:
             )
             self.tray.setVisible(True)
 
+    # Delay before showing the context menu, in milliseconds.
+    # Absorbs residual mouse-up events from touchpad two-finger taps
+    # that would otherwise land on a menu item (typically "Quit").
+    _MENU_POPUP_DELAY_MS = 80
+
     def _on_tray_activated(self, reason: QSystemTrayIcon.ActivationReason) -> None:
-        """Handle tray icon activation (e.g. double-click)."""
+        """Handle tray icon activation."""
+        logger.debug('Tray activated: reason=%s', reason.name)
         if reason == QSystemTrayIcon.ActivationReason.DoubleClick:
             self._window.show()
             self._window.raise_()
             self._window.activateWindow()
+        elif reason == QSystemTrayIcon.ActivationReason.Context:
+            QTimer.singleShot(self._MENU_POPUP_DELAY_MS, self._show_tray_menu)
+
+    def _show_tray_menu(self) -> None:
+        """Show the tray context menu at the current cursor position."""
+        self._menu.exec(QCursor.pos())
+
+    def _on_quit_triggered(self) -> None:
+        """Handle the Quit menu action."""
+        logger.info('Quit requested via tray menu')
+        self._app.quit()
 
     def _show_settings(self) -> None:
         """Show the settings window."""

{synodic_client-0.0.1.dev81 → synodic_client-0.0.1.dev82}/tests/unit/qt/test_tray_window_show.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 from unittest.mock import MagicMock, patch
 
 import pytest
+from PySide6.QtWidgets import QSystemTrayIcon
 
 from synodic_client.application.screen.schema import UpdateTarget
 from synodic_client.application.screen.tray import TrayScreen
@@ -69,3 +70,32 @@ class TestToolUpdateWindowShow:
         result = UpdateResult(manifests_processed=1, already_latest=['pkg'])
         tray_screen._tool_orchestrator._on_tool_update_finished(result)
         tray_screen._window.show.assert_not_called()
+
+
+class TestTrayActivation:
+    """_on_tray_activated should dispatch correctly by reason."""
+
+    @staticmethod
+    def test_double_click_shows_window(tray_screen) -> None:
+        """Double-clicking the tray icon should show and raise the window."""
+        tray_screen._on_tray_activated(QSystemTrayIcon.ActivationReason.DoubleClick)
+        tray_screen._window.show.assert_called_once()
+        tray_screen._window.raise_.assert_called_once()
+        tray_screen._window.activateWindow.assert_called_once()
+
+    @staticmethod
+    def test_context_defers_menu_via_timer(tray_screen) -> None:
+        """Right-clicking should defer the menu popup via a single-shot timer."""
+        with patch('synodic_client.application.screen.tray.QTimer') as mock_timer:
+            tray_screen._on_tray_activated(QSystemTrayIcon.ActivationReason.Context)
+            mock_timer.singleShot.assert_called_once()
+            delay, callback = mock_timer.singleShot.call_args[0]
+            assert delay == TrayScreen._MENU_POPUP_DELAY_MS
+            assert callback == tray_screen._show_tray_menu
+
+    @staticmethod
+    def test_context_does_not_show_window(tray_screen) -> None:
+        """Right-clicking should not bring the main window forward."""
+        with patch('synodic_client.application.screen.tray.QTimer'):
+            tray_screen._on_tray_activated(QSystemTrayIcon.ActivationReason.Context)
+        tray_screen._window.show.assert_not_called()