Cleanup drag simulation

ThomasFarstrike · ThomasFarstrike · commit 7f69276f211c · 2026-05-19T18:50:18.000+02:00
diff --git a/internal_filesystem/apps/com.micropythonos.space_invaders/res/mipmap-mdpi/icon_64x64.png b/internal_filesystem/apps/com.micropythonos.space_invaders/res/mipmap-mdpi/icon_64x64.png
diff --git a/internal_filesystem/lib/mpos/ui/testing.py b/internal_filesystem/lib/mpos/ui/testing.py
@@ -42,6 +42,7 @@
 """
 
 import lvgl as lv
+import sys
 import time
 
 try:
@@ -1141,6 +1142,11 @@ def simulate_drag(start_x, start_y, end_x, end_y, steps=5, step_delay_ms=20):
     """
     Simulate a drag gesture from start to end coordinates.
 
+    On desktop (Linux/macOS/Windows), uses a stepped approach with
+    discrete click+render at each interpolated point, which is proven
+    reliable with the LVGL unix port.  On device (ESP32), uses a
+    continuous press-and-drag for real touch input.
+
     Args:
         start_x: Starting X coordinate.
         start_y: Starting Y coordinate.
@@ -1149,6 +1155,37 @@ def simulate_drag(start_x, start_y, end_x, end_y, steps=5, step_delay_ms=20):
         steps: Number of intermediate steps to simulate (default: 5).
         step_delay_ms: Delay between steps in milliseconds (default: 20).
     """
+    if sys.platform in ("linux", "darwin", "win32"):
+        global _touch_x, _touch_y, _touch_pressed
+
+        _ensure_touch_indev()
+        n = max(steps, 1)
+
+        _touch_x = start_x
+        _touch_y = start_y
+        _touch_pressed = True
+
+        _touch_indev.read()
+        time.sleep(0.01)
+        _touch_indev.read()
+        time.sleep(step_delay_ms / 1000.0)
+
+        for i in range(1, n + 1):
+            _touch_x = start_x + (end_x - start_x) * i // n
+            _touch_y = start_y + (end_y - start_y) * i // n
+            _touch_indev.read()
+            time.sleep(0.01)
+            _touch_indev.read()
+            time.sleep(step_delay_ms / 1000.0)
+
+        _touch_pressed = False
+        _touch_indev.read()
+        time.sleep(0.01)
+        _touch_indev.read()
+        time.sleep(0.01)
+        _touch_indev.read()
+        return
+
     global _touch_x, _touch_y, _touch_pressed
 
     _ensure_touch_indev()
diff --git a/tests/test_graphical_notification_bar.py b/tests/test_graphical_notification_bar.py
@@ -102,22 +102,10 @@ def _wait_for_bar_hidden(self, bar, timeout_ms=4500):
         return False
 
     def _ensure_bar_closed(self, bar_coords, bar):
-        if self._swipe_up_on_bar(bar_coords, bar):
-            return True
-        topmenu.close_bar()
-        wait_for_render(iterations=120)
-        if self._wait_for_bar_hidden(bar, timeout_ms=4500):
-            return True
-        topmenu.close_bar()
-        wait_for_render(iterations=120)
-        return self._wait_for_bar_hidden(bar, timeout_ms=4500)
+        return self._swipe_up_on_bar(bar_coords, bar)
 
     def _ensure_drawer_open(self, bar_coords):
-        if self._swipe_down_on_bar(bar_coords):
-            return True
-        topmenu.open_drawer()
-        wait_for_render(iterations=80)
-        return self._wait_for_drawer_open(timeout_ms=2500)
+        return self._swipe_down_on_bar(bar_coords)
 
     def _swipe_down_on_bar(self, bar_coords):
         start_x = DisplayMetrics.width() // 2
@@ -188,7 +176,7 @@ def test_notification_bar_widgets_visible(self):
 
         self.assertTrue(
             self._ensure_drawer_open(bar_coords),
-            "Drawer did not open after swipe or fallback open",
+            "Drawer did not open after swipe",
         )
         self.assertTrue(topmenu.drawer_open, "Drawer state not open after swipe")
         self.assertIsNotNone(topmenu.drawer, "Drawer object not found after swipe")
