From 02a35e65aaec5f2eb6093d02fcfdf61606d7fd30 Mon Sep 17 00:00:00 2001
From: MarkPiazuelo <markmark1pf@gmail.com>
Date: Fri, 5 Dec 2025 13:37:11 +0100
Subject: [PATCH] TopMenu Fix

Fixed a bug where the "drawerOpen" variable would not be updated in gesture_navigation.py. Also added the back gesture as a way to exit the drawer.
---
 .DS_Store                                     | Bin 0 -> 8196 bytes
 .../lib/mpos/ui/gesture_navigation.py         |  22 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..4d2b0bfa37a618f5096150da05aabe835f8c6fec
GIT binary patch
literal 8196
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

literal 0
HcmV?d00001

diff --git a/internal_filesystem/lib/mpos/ui/gesture_navigation.py b/internal_filesystem/lib/mpos/ui/gesture_navigation.py
index c43a25ad..22236e43 100644
--- a/internal_filesystem/lib/mpos/ui/gesture_navigation.py
+++ b/internal_filesystem/lib/mpos/ui/gesture_navigation.py
@@ -2,7 +2,8 @@ import lvgl as lv
 from lvgl import LvReferenceError
 from .anim import smooth_show, smooth_hide
 from .view import back_screen
-from .topmenu import open_drawer, drawer_open, NOTIFICATION_BAR_HEIGHT
+from mpos.ui import topmenu as topmenu
+#from .topmenu import open_drawer, drawer_open, NOTIFICATION_BAR_HEIGHT
 from .display import get_display_width, get_display_height
 
 downbutton = None
@@ -31,10 +32,6 @@ def _passthrough_click(x, y, indev):
             print(f"Object to click is gone: {e}")
 
 def _back_swipe_cb(event):
-    if drawer_open:
-        print("ignoring back gesture because drawer is open")
-        return
-
     global backbutton, back_start_y, back_start_x, backbutton_visible
     event_code = event.get_code()
     indev = lv.indev_active()
@@ -61,13 +58,16 @@ def _back_swipe_cb(event):
             backbutton_visible = False
             smooth_hide(backbutton)
         if x > get_display_width() / 5:
-            back_screen()
+            if topmenu.drawer_open :
+                topmenu.close_drawer()
+            else : 
+                back_screen()
         elif is_short_movement(dx, dy):
             # print("Short movement - treating as tap")
             _passthrough_click(x, y, indev)
 
 def _top_swipe_cb(event):
-    if drawer_open:
+    if topmenu.drawer_open:
         print("ignoring top swipe gesture because drawer is open")
         return
 
@@ -99,7 +99,7 @@ def _top_swipe_cb(event):
         dx = abs(x - down_start_x)
         dy = abs(y - down_start_y)
         if y > get_display_height() / 5:
-            open_drawer()
+            topmenu.open_drawer()
         elif is_short_movement(dx, dy):
             # print("Short movement - treating as tap")
             _passthrough_click(x, y, indev)
@@ -107,10 +107,10 @@ def _top_swipe_cb(event):
 def handle_back_swipe():
     global backbutton
     rect = lv.obj(lv.layer_top())
-    rect.set_size(NOTIFICATION_BAR_HEIGHT, lv.layer_top().get_height()-NOTIFICATION_BAR_HEIGHT) # narrow because it overlaps buttons
+    rect.set_size(topmenu.NOTIFICATION_BAR_HEIGHT, lv.layer_top().get_height()-topmenu.NOTIFICATION_BAR_HEIGHT) # narrow because it overlaps buttons
     rect.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
     rect.set_scroll_dir(lv.DIR.NONE)
-    rect.set_pos(0, NOTIFICATION_BAR_HEIGHT)
+    rect.set_pos(0, topmenu.NOTIFICATION_BAR_HEIGHT)
     style = lv.style_t()
     style.init()
     style.set_bg_opa(lv.OPA.TRANSP)
@@ -138,7 +138,7 @@ def handle_back_swipe():
 def handle_top_swipe():
     global downbutton
     rect = lv.obj(lv.layer_top())
-    rect.set_size(lv.pct(100), NOTIFICATION_BAR_HEIGHT)
+    rect.set_size(lv.pct(100), topmenu.NOTIFICATION_BAR_HEIGHT)
     rect.set_pos(0, 0)
     rect.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
     style = lv.style_t()