From 648b0f33c5de3b2631b6c81b6461baefc3b9782c Mon Sep 17 00:00:00 2001
From: Martin Preuss <martin@aquamaniac.de>
Date: Mon, 9 Mar 2026 02:28:33 +0100
Subject: [PATCH] gui2: fixed a bug, added debug code.

---
 avr/modules/lcd2/gui2/base/mainwindow.asm | 8 +++++++-
 avr/modules/lcd2/gui2/base/widget.asm     | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/avr/modules/lcd2/gui2/base/mainwindow.asm b/avr/modules/lcd2/gui2/base/mainwindow.asm
index f03efb8..481931d 100644
--- a/avr/modules/lcd2/gui2/base/mainwindow.asm
+++ b/avr/modules/lcd2/gui2/base/mainwindow.asm
@@ -88,7 +88,7 @@ MainWindow_Init:
 
   ; create sub widgets
   rcall mainWindowCreateTitleWidget
-;  rcall mainWindowCreateContentWidget
+  rcall mainWindowCreateContentWidget
 
   ret
 ; @end
@@ -178,6 +178,12 @@ mainWindowCreateTitleWidget:
       std Y+WIDGET_OFFS_STYLE_LO, r16
       ldi r16, HIGH(MainWindow_TitleStyle*2)
       std Y+WIDGET_OFFS_STYLE_HI, r16
+      
+      ; DEBUG
+      ldd r16, Y+OBJECT_OFFS_FLAGS
+      sbr r16, (1<<WIDGET_FLAGS_VISIBLE_BIT) | (1<<WIDGET_FLAGS_LAYOUT_BIT) | (1<<WIDGET_FLAGS_DIRTY_BIT)
+      std Y+OBJECT_OFFS_FLAGS, r16
+      
       sec
 mainWindowCreateTitleWidget_done:
     pop yh
diff --git a/avr/modules/lcd2/gui2/base/widget.asm b/avr/modules/lcd2/gui2/base/widget.asm
index c1f78f7..4a03c63 100644
--- a/avr/modules/lcd2/gui2/base/widget.asm
+++ b/avr/modules/lcd2/gui2/base/widget.asm
@@ -901,7 +901,7 @@ widgetDrawChar:
         ldd zl, Y+WIDGET_OFFS_STYLE_LO
         ldd zh, Y+WIDGET_OFFS_STYLE_HI
         adiw zh:zl, WIDGET_STYLE_OFFS_CHARWIDTH
-        lpm r18, Z
+        lpm r18, Z                                ; char width
         sbiw zh:zl, WIDGET_STYLE_OFFS_CHARWIDTH
         adiw zh:zl, WIDGET_STYLE_OFFS_FONT_LO
         lpm r19, Z+
@@ -909,6 +909,7 @@ widgetDrawChar:
         mov zl, r19
         
         ; check whether char fits into widget
+        mov r16, r18
         clr r17
         add r16, r4                        ; char width+X
         adc r17, r5