gui: improved style handling.

2026-05-08 10:02:34 +02:00
parent cc65fb8f0b
commit f154146b14
4 changed files with 171 additions and 55 deletions
--- a/avr/modules/lcd2/gui/base/cwidget.asm
+++ b/avr/modules/lcd2/gui/base/cwidget.asm
@@ -239,14 +239,17 @@ cWidgetMkChildWidget_typeOk:
  
  ; set style (if any)
  adiw zh:zl, CWIDGETCFG_OFFS_WIDGET_STYLE_LO
-  lpm r16, Z+
-  lpm r17, Z
+  lpm xl, Z+
+  lpm xh, Z
  sbiw zh:zl, (CWIDGETCFG_OFFS_WIDGET_STYLE_LO+1)
-  mov r18, r16
-  or r18, r17
+  mov r18, xl
+  or r18, xh
  breq cWidgetMkChildWidget_setminmax
-  std Y+WIDGET_OFFS_STYLE_LO, r16
-  std Y+WIDGET_OFFS_STYLE_HI, r17
+  push zl
+    push zh
+      bigcall Widget_SetStyle
+    pop zh
+  pop zl
 cWidgetMkChildWidget_setminmax:
  adiw zh:zl, CWIDGETCFG_OFFS_WIDGET_FLAGS
  lpm r16, Z