gui2: fixed more bugs in layout code. Now basically works!

2026-03-11 19:53:19 +01:00
parent f6736c345d
commit 092c667291
10 changed files with 90 additions and 68 deletions
--- a/avr/modules/lcd2/gui2/base/valuelabel.asm
+++ b/avr/modules/lcd2/gui2/base/valuelabel.asm
@@ -153,7 +153,7 @@ ValueLabel_OnDraw_ret:
 ; @clobbers any, !Y

 ValueLabel_OnGetDefaultWidth:
-  rcall labelCalcTextWidth
+  rcall valueLabelCalcTextWidth
  mov r18, r12
  mov r19, r13
  bigcall Widget_AddOuterStyleBorders  ; (r20, r21)
@@ -237,7 +237,6 @@ valueLabelCalcTextWidth:
  rcall Widget_GetCharWidth                 ; R16=char width
  mov r18, r16
  bigcall Widget_CalcStringWidthSDRAM       ; r13:r12=size (r16)
-  sec
 valueLabelCalcTextWidth_ret:
  ret
 ; @end