select rows only after completed clicks

Require a left-button press and release inside the same Shortcut Reference row before selecting it. Ignore release-only, drag-out, right-click, and middle-click interactions, with regression coverage for each case.

Author: AlexHettle

MeadowPy/dev/tests/test_ui_panels_and_dialogs.py

@@ -5,7 +5,7 @@
 from types import SimpleNamespace
 
 from PyQt6.QtCore import QEvent, QPoint, QPointF, Qt
-from PyQt6.QtGui import QAction, QColor, QFont, QKeyEvent, QPalette
+from PyQt6.QtGui import QAction, QColor, QFont, QKeyEvent, QMouseEvent, QPalette
 from PyQt6.QtTest import QTest
 from PyQt6.QtWidgets import (
     QFontComboBox,
@@ -118,6 +118,93 @@ def test_shortcut_confirmation_dialogs_expose_choices_and_actions(qapp):
     reset_dialog.deleteLater()
 
 
+def test_shortcut_row_selects_only_after_completed_left_click(qapp):
+    definition = ShortcutDefinition(
+        "test.row",
+        "Test",
+        "Select row",
+        "Ctrl+R",
+        "Select a shortcut row.",
+    )
+    row = shortcut_reference_module._ShortcutRow(definition, "Ctrl+R")
+    row.resize(240, 40)
+    selected = Recorder()
+    row.selected.connect(selected)
+    inside = QPointF(row.rect().center())
+    outside = QPointF(-1, -1)
+
+    def mouse_event(event_type, position, button, buttons):
+        return QMouseEvent(
+            event_type,
+            position,
+            button,
+            buttons,
+            Qt.KeyboardModifier.NoModifier,
+        )
+
+    row.mouseReleaseEvent(
+        mouse_event(
+            QEvent.Type.MouseButtonRelease,
+            inside,
+            Qt.MouseButton.LeftButton,
+            Qt.MouseButton.NoButton,
+        )
+    )
+    assert selected.calls == []
+
+    row.mousePressEvent(
+        mouse_event(
+            QEvent.Type.MouseButtonPress,
+            inside,
+            Qt.MouseButton.LeftButton,
+            Qt.MouseButton.LeftButton,
+        )
+    )
+    assert selected.calls == []
+    row.mouseReleaseEvent(
+        mouse_event(
+            QEvent.Type.MouseButtonRelease,
+            outside,
+            Qt.MouseButton.LeftButton,
+            Qt.MouseButton.NoButton,
+        )
+    )
+    assert selected.calls == []
+
+    for button in (Qt.MouseButton.RightButton, Qt.MouseButton.MiddleButton):
+        row.mousePressEvent(
+            mouse_event(QEvent.Type.MouseButtonPress, inside, button, button)
+        )
+        row.mouseReleaseEvent(
+            mouse_event(
+                QEvent.Type.MouseButtonRelease,
+                inside,
+                button,
+                Qt.MouseButton.NoButton,
+            )
+        )
+    assert selected.calls == []
+
+    row.mousePressEvent(
+        mouse_event(
+            QEvent.Type.MouseButtonPress,
+            inside,
+            Qt.MouseButton.LeftButton,
+            Qt.MouseButton.LeftButton,
+        )
+    )
+    row.mouseReleaseEvent(
+        mouse_event(
+            QEvent.Type.MouseButtonRelease,
+            inside,
+            Qt.MouseButton.LeftButton,
+            Qt.MouseButton.NoButton,
+        )
+    )
+    assert selected.calls == [(definition.id,)]
+    row.deleteLater()
+
+
 def test_shortcut_capture_escape_clear_and_memory_settings(qapp):
     definition = ShortcutDefinition(
         "test.capture",

MeadowPy/meadowpy/ui/dialogs/shortcut_reference_dialog.py

@@ -175,6 +175,7 @@ class _ShortcutRow(QFrame):
     def __init__(self, definition: ShortcutDefinition, shortcut: str, parent=None):
         super().__init__(parent)
         self.definition = definition
+        self._left_button_pressed = False
         self.setObjectName("shortcutRow")
         self.setCursor(Qt.CursorShape.PointingHandCursor)
         self._shortcut_text = ""
@@ -219,12 +220,23 @@ def matches_filter(self, text: str) -> bool:
         )
 
     def mousePressEvent(self, event) -> None:  # noqa: N802
-        if event.button() == Qt.MouseButton.LeftButton:
-            self.selected.emit(self.definition.id)
-            event.accept()
-            return
+        self._left_button_pressed = (
+            event.button() == Qt.MouseButton.LeftButton
+            and self.rect().contains(event.position().toPoint())
+        )
         super().mousePressEvent(event)
 
+    def mouseReleaseEvent(self, event) -> None:  # noqa: N802
+        should_select = (
+            self._left_button_pressed
+            and event.button() == Qt.MouseButton.LeftButton
+            and self.rect().contains(event.position().toPoint())
+        )
+        self._left_button_pressed = False
+        super().mouseReleaseEvent(event)
+        if should_select:
+            self.selected.emit(self.definition.id)
+
 
 class _ShortcutListSection(QFrame):
     """A category section in the left shortcut list."""