From 4fec5433b3170efd6cc5a64dc9e4a441d0e77527 Mon Sep 17 00:00:00 2001
From: Martin Preuss <martin@aquamaniac.de>
Date: Mon, 9 Feb 2026 19:07:05 +0100
Subject: [PATCH] avr: minor changes

- save Y in GuiApp_ShowView
- fix apidoc
- change order in guiAppShowCurrent
---
 avr/modules/lcd2/gui2/generic/guiapp.asm | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/avr/modules/lcd2/gui2/generic/guiapp.asm b/avr/modules/lcd2/gui2/generic/guiapp.asm
index a0f8798..9823ff8 100644
--- a/avr/modules/lcd2/gui2/generic/guiapp.asm
+++ b/avr/modules/lcd2/gui2/generic/guiapp.asm
@@ -357,8 +357,12 @@ GuiApp_ShowView:
   or r18, r19                                 ; 0 if r19:r18==X
   breq GuiApp_ShowView_ret                    ; same, no change
 
-  rcall guiAppHideCurrent
-
+  push yl
+    push yh
+      rcall guiAppHideCurrent                 ; (any, !X, !Z)
+    pop yh
+  pop yl
+  
   ; store new view
   std Y+GUIAPP_SD_OFFS_CURRENTWIDGET_LO, xl
   std Y+GUIAPP_SD_OFFS_CURRENTWIDGET_HI, xh
@@ -448,7 +452,7 @@ GuiApp_UngrabTouchEvents_ret:
 ; @routine guiAppHideCurrent
 ;
 ; @param Z byte address of gui app object (for LPM!)
-; @clobbers any, !X, !Y. !Z
+; @clobbers any, !X, !Z
 
 guiAppHideCurrent:
   push zl
@@ -476,7 +480,7 @@ guiAppHideCurrent_done:
 ; @routine guiAppShowCurrent
 ;
 ; @param Z byte address of gui app object (for LPM!)
-; @clobbers any, !X, !Y. !Z
+; @clobbers any, !X, !Z
 
 guiAppShowCurrent:
   push zl
@@ -487,14 +491,16 @@ guiAppShowCurrent:
       mov r16, zl
       or r16, zh
       breq guiAppShowCurrent_done
-      ldi r16, WIDGET_SIGNAL_SHOW
-      clr r17
-      bigcall OBJ_HandleSignal
       ldi r16, (1<<WIDGET_FLAGS_ACTIVE_BIT) | (1<<WIDGET_FLAGS_DIRTY_BIT)
       bigcall Widget_AddFlagsDown
+      ldi r16, WIDGET_SIGNAL_SHOW
+      clr r17
+      bigcall OBJ_HandleSignal                    ; (any, !X, !Y. !Z)
 guiAppShowCurrent_done:
     pop zh
   pop zl
+
+  rcall guiAppDrawWidgets                         ; (any, !Z)
   ret
 ; @end