fix: reset layout state when device disconnects

Author: thisislvca

tests/test_backend.py

@@ -0,0 +1,38 @@
+import copy
+import unittest
+from unittest.mock import patch
+
+from core.config import DEFAULT_CONFIG
+
+try:
+    from ui.backend import Backend
+except ModuleNotFoundError:
+    Backend = None
+
+
+@unittest.skipIf(Backend is None, "PySide6 not installed in test environment")
+class BackendDeviceLayoutTests(unittest.TestCase):
+    def _make_backend(self):
+        with (
+            patch("ui.backend.load_config", return_value=copy.deepcopy(DEFAULT_CONFIG)),
+            patch("ui.backend.save_config"),
+        ):
+            return Backend(engine=None)
+
+    def test_defaults_to_generic_layout_without_connected_device(self):
+        backend = self._make_backend()
+
+        self.assertEqual(backend.effectiveDeviceLayoutKey, "generic_mouse")
+        self.assertFalse(backend.hasInteractiveDeviceLayout)
+
+    def test_disconnected_override_request_does_not_persist(self):
+        backend = self._make_backend()
+        backend._connected_device_key = "mx_master_3"
+        backend.setDeviceLayoutOverride("mx_master")
+
+        overrides = backend._cfg.get("settings", {}).get("device_layout_overrides", {})
+        self.assertEqual(overrides, {})
+
+
+if __name__ == "__main__":
+    unittest.main()

ui/backend.py

@@ -56,7 +56,7 @@ def __init__(self, engine=None, parent=None):
         self._device_display_name = "Logitech mouse"
         self._connected_device_key = ""
         self._device_layout_override_key = ""
-        self._device_layout = get_device_layout("mx_master")
+        self._device_layout = get_device_layout("generic_mouse")
         self._battery_level = -1
         self._debug_lines = []
         self._debug_events_enabled = bool(
@@ -475,7 +475,7 @@ def actionLabelFor(self, actionId):
     def setDeviceLayoutOverride(self, layoutKey):
         normalized = (layoutKey or "").strip()
         device_key = self._connected_device_key
-        if not device_key:
+        if not self._mouse_connected or not device_key:
             self.statusMessage.emit("Connect a device first")
             return
         valid_choices = {choice["key"] for choice in get_manual_layout_choices()}
@@ -549,6 +549,8 @@ def _handleConnectionChange(self, connected):
         device = getattr(self._engine, "connected_device", None) if self._engine else None
         if connected:
             self._apply_device_layout(device)
+        else:
+            self._apply_device_layout(None)
         if not connected and self._battery_level != -1:
             self._battery_level = -1
             self.batteryLevelChanged.emit()
@@ -571,8 +573,11 @@ def _apply_device_layout(self, device):
             self.deviceInfoChanged.emit()
 
         overrides = self._cfg.get("settings", {}).get("device_layout_overrides", {})
+        valid_override_keys = {choice["key"] for choice in get_manual_layout_choices()}
         override_key = overrides.get(device_key, "") if device_key else ""
-        layout_key = override_key or getattr(device, "ui_layout", None) or "mx_master"
+        if override_key not in valid_override_keys:
+            override_key = ""
+        layout_key = override_key or getattr(device, "ui_layout", None) or "generic_mouse"
         layout = get_device_layout(layout_key)
         layout_changed = False
         if override_key != self._device_layout_override_key: