From d54a2590607d8771f72b66d45d70a33c2e02e18b Mon Sep 17 00:00:00 2001
From: Martin Preuss <martin@aquamaniac.de>
Date: Mon, 11 May 2026 11:55:56 +0200
Subject: [PATCH] gui: adapted ScreenSaver to latest changes.

---
 avr/modules/lcd2/gui/screensavers/simple.asm | 35 ++++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/avr/modules/lcd2/gui/screensavers/simple.asm b/avr/modules/lcd2/gui/screensavers/simple.asm
index 0094296..4d037d9 100644
--- a/avr/modules/lcd2/gui/screensavers/simple.asm
+++ b/avr/modules/lcd2/gui/screensavers/simple.asm
@@ -296,6 +296,25 @@ SimpleSaver_OnMsgReceived:
 
 
 SimpleSaver_OnShow:
+  ldd r16, Y+OBJECT_OFFS_FLAGS
+  sbrc r16, WIDGET_FLAGS_VISIBLE_BIT
+    rjmp SimpleSaver_OnShow_ret
+
+  bigcall MainWindow_CreateContentWidget    ; R19:R18=content window
+  brcc SimpleSaver_OnShow_ret
+
+  ; overwrite content window style (use black background)
+  push yl
+    push yh
+      mov yl, r18
+      mov yh, r19
+      ldi r16, LOW(SimpleSaver_DefaultStyle*2)
+      std Y+WIDGET_OFFS_STYLE_LO, r16
+      ldi r16, HIGH(SimpleSaver_DefaultStyle*2)
+      std Y+WIDGET_OFFS_STYLE_HI, r16
+    pop yh
+  pop yl
+  
   ; stop timer
   clr r16
   std Y+SIMPLESAVER_OFFS_TIMER_LO, r16
@@ -306,6 +325,7 @@ SimpleSaver_OnShow:
   sbr r16, (1<<WIDGET_FLAGS_DIRTY_BIT) | (1<<WIDGET_FLAGS_VISIBLE_BIT)
   std Y+OBJECT_OFFS_FLAGS, r16
 
+SimpleSaver_OnShow_ret:
   ; turn off backlight
   clr r16
   bigcall Display_SetBacklight
@@ -315,17 +335,26 @@ SimpleSaver_OnShow:
 
 
 
+; ---------------------------------------------------------------------------
+; @routine SimpleSaver_OnHide @global
+;
+; @param  Y       pointer to dialog
+; @return CFLAG set of okay, cleared otherwise
+; @clobbers any, !Y
+
 SimpleSaver_OnHide:
   ldd r16, Y+OBJECT_OFFS_FLAGS
-  cbr r16, (1<<WIDGET_FLAGS_VISIBLE_BIT)
-  std Y+OBJECT_OFFS_FLAGS, r16
+  sbrs r16, WIDGET_FLAGS_VISIBLE_BIT
+    rjmp SimpleSaver_OnHide_ret
+
+  bigcall Dialog_OnHide  ; destroys content window
   
   ; restart timer
   ldd r16, Y+SIMPLESAVER_OFFS_RELOAD_LO
   ldd r17, Y+SIMPLESAVER_OFFS_RELOAD_HI
   std Y+SIMPLESAVER_OFFS_TIMER_LO, r16
   std Y+SIMPLESAVER_OFFS_TIMER_HI, r17
-
+SimpleSaver_OnHide_ret:
   ; turn backlight on
   ldi r16, 0xff
   bigcall Display_SetBacklight