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/aqhome/sensorwatch.asm
+++ b/avr/modules/lcd2/gui2/aqhome/sensorwatch.asm
@@ -127,7 +127,7 @@ SensorWatch_Init:
  rcall sensorWatchCreateTitleLabel
  rcall sensorWatchCreateImageViewer
  rcall sensorWatchCreateValueLabel
-  
+
  ret
 ; @end

@@ -226,7 +226,7 @@ sensorWatchCreateTitleLabel:
      mov xl, yl
      mov xh, yh
      ldi r16, 0
-      ldi r17, (WIDGET_PACK_CENTER<<WIDGET_PACK_HSELF0_BIT)     | (WIDGET_PACK_CENTER<<WIDGET_PACK_VSELF0_BIT) | \
+      ldi r17, (WIDGET_PACK_CENTER<<WIDGET_PACK_HSELF0_BIT)     | (WIDGET_PACK_BEGIN<<WIDGET_PACK_VSELF0_BIT) | \
               (WIDGET_PACK_CENTER<<WIDGET_PACK_HCONTENT0_BIT)  | (WIDGET_PACK_CENTER<<WIDGET_PACK_VCONTENT0_BIT)
      bigcall Label_new
    pop yh
@@ -310,8 +310,7 @@ SensorWatch_Descriptors:
  .dw RESSSOURCE_TXT_UNKNOWN_S,  RESSSOURCE_IMG_CLOUD96,     0                   ; unknown
  .dw RESSSOURCE_TXT_CO2_S,      RESSSOURCE_IMG_CLOUD96,     0                   ; co2
  .dw RESSSOURCE_TXT_TEMP_S,     RESSSOURCE_IMG_TEMP96,      2                   ; temp
-;  .dw RESSSOURCE_TXT_HUM_S,      RESSSOURCE_IMG_HUMIDITY96,  0                   ; hum
-  .dw RESSSOURCE_TXT_TEMP_S,      RESSSOURCE_IMG_HUMIDITY96,  0                   ; hum
+  .dw RESSSOURCE_TXT_HUM_S,      RESSSOURCE_IMG_HUMIDITY96,  0                   ; hum


 #endif
--- a/avr/modules/lcd2/gui2/base/hlayout.asm
+++ b/avr/modules/lcd2/gui2/base/hlayout.asm
@@ -212,7 +212,7 @@ hLayoutSetX_loopEnd:
 ; @clobbers any, !Y

 hLayoutVertically:
-  bigcall Layout_SetDefaultWidths ; (any, !Y)
+  bigcall Layout_SetDefaultHeights ; (any, !Y)
  ; calc usable height of host widget
  ldd r22, Y+WIDGET_OFFS_HEIGHT_LO
  ldd r23, Y+WIDGET_OFFS_HEIGHT_HI
@@ -359,37 +359,8 @@ hLayoutSpread:

 hLayoutPrepareSpread:
  rcall Layout_SetDefaultWidths                           ; (any, !Y)
-  rcall Layout_SumTmpValues                               ; r21:r20=width+borders
+  rcall hLayoutCalcSpreadValue                            ; r21:r20=spread value (r16, r17, r18, r19, r20, r21, r22, r23, Z)

-  ldd r18, Y+WIDGET_OFFS_WIDTH_LO
-  ldd r19, Y+WIDGET_OFFS_WIDTH_HI
-  sub r18, r20                                            ; width-usedWidth
-  sbc r19, r21
-  brcc hLayoutPrepareSpread_calcAdd
-  clr r20
-  clr r21
-  rjmp hLayoutPrepareSpread_finish
-
-hLayoutPrepareSpread_calcAdd:
-  mov r20, r18
-  mov r21, r19                                            ; remaining space
-  
-  rcall LayoutCountVisibleChildren                        ; r16=number of visible child widgets (r17, r18, r19)
-  inc r16                                                 ; r16=number of spacings (begin->between->end)
-  mov r22, r16
-  push r22
-    ldi r22, (1<<WIDGET_PACK_HSELF1_BIT) | \
-             (1<<WIDGET_PACK_HSELF0_BIT)                  ; mask
-    ldi r23, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) ; value
-    rcall LayoutCountChildrenWithPackMode                 ; r16=number of expandable children (r17, r18, r19)
-  pop r22
-  add r22, r16                                            ; r22=number of items to spread
-  clr r23
-  bigcall Utils_Divu16_16_16                              ; r17:r16=space per element
-  mov r20, r16
-  mov r21, r17                                            ; r21:20=additional space per element
-
-hLayoutPrepareSpread_finish:
  ; get and adjust spacing, setup start pos
  ldd zl, Y+WIDGET_OFFS_STYLE_LO
  ldd zh, Y+WIDGET_OFFS_STYLE_HI
@@ -410,6 +381,57 @@ hLayoutPrepareSpread_finish:



+; ---------------------------------------------------------------------------
+; @routine hLayoutCalcSpreadValue
+;
+; @param Y pointer to widget
+; @return r21:r20 spread value to add to spacings and expandable children
+; @clobbers r16, r17, r18, r19, r20, r21, r22, r23, Z
+
+hLayoutCalcSpreadValue:
+  ; calc used width
+  rcall Layout_SumTmpValues                               ; r21:r20=width+borders
+  ldd r18, Y+WIDGET_OFFS_WIDTH_LO
+  ldd r19, Y+WIDGET_OFFS_WIDTH_HI
+  sub r18, r20                                            ; width-usedWidth
+  sbc r19, r21
+  brcc hLayoutCalcSpreadValue_calcAdd
+  clr r20
+  clr r21
+  rjmp hLayoutCalcSpreadValue_ret
+
+  ; r19:r18=remaining space
+hLayoutCalcSpreadValue_calcAdd:
+  mov r20, r18
+  mov r21, r19                                            ; remaining space
+  
+  rcall LayoutCountVisibleChildren                        ; r16=number of visible child widgets (r17, r18, r19)
+  inc r16                                                 ; r16=number of spacings (begin->between->end)
+  mov r22, r16
+  push r22
+    ldi r22, (1<<WIDGET_PACK_HSELF1_BIT) | \
+             (1<<WIDGET_PACK_HSELF0_BIT)                  ; mask
+    ldi r23, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) ; value
+    rcall LayoutCountChildrenWithPackMode                 ; r16=number of expandable children (r17, r18, r19)
+  pop r22
+  add r22, r16                                            ; r22=number of items to spread
+  tst r22
+  brne hLayoutCalcSpreadValue_div
+  clr r20
+  clr r21
+  rjmp hLayoutCalcSpreadValue_ret
+  
+hLayoutCalcSpreadValue_div:
+  clr r23
+  bigcall Utils_Divu16_16_16                              ; r17:r16=space per element
+  mov r20, r16
+  mov r21, r17                                            ; r21:20=additional space per element
+hLayoutCalcSpreadValue_ret:
+  ret
+; @end
+
+
+
 ; ---------------------------------------------------------------------------
 ; @routine hLayoutFinalizeSpread
 ;
@@ -430,12 +452,10 @@ hLayoutFinalizeSpread_loop:
        ldd r17, Y+OBJECT_OFFS_FLAGS
        sbrs r17, WIDGET_FLAGS_VISIBLE_BIT            ; skip invisible widgets
          rjmp hLayoutFinalizeSpread_next
-        ; store pos
-        std Y+WIDGET_OFFS_X_LO, xl
-        std Y+WIDGET_OFFS_X_LO, xh
-        ; determine final height of child widget
+
+        ; determine final width of child widget
        ldd r18, Y+WIDGET_OFFS_TMP_LO
-        ldd r19, Y+WIDGET_OFFS_TMP_LO
+        ldd r19, Y+WIDGET_OFFS_TMP_HI
        ldd r16, Y+WIDGET_OFFS_PACK
        andi r16, (1<<WIDGET_PACK_HSELF1_BIT) | (1<<WIDGET_PACK_HSELF0_BIT)
        cpi r16, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT)
@@ -443,8 +463,12 @@ hLayoutFinalizeSpread_loop:
        add r18, r20                      ; add extra space
        adc r19, r21
 hLayoutFinalizeSpread_setWidth:
+        ; store width
        std Y+WIDGET_OFFS_WIDTH_LO, r18
        std Y+WIDGET_OFFS_WIDTH_HI, r19
+        ; store pos
+        std Y+WIDGET_OFFS_X_LO, xl
+        std Y+WIDGET_OFFS_X_HI, xh
        ; advance pos
        add xl, r18                       ; add width to current pos
        adc xh, r19
--- a/avr/modules/lcd2/gui2/base/layout.asm
+++ b/avr/modules/lcd2/gui2/base/layout.asm
@@ -314,10 +314,5 @@ LayoutIncTmpOnMatchingPack_done:



-
-
-
-
-
 #endif

--- a/avr/modules/lcd2/gui2/base/mainwindow.asm
+++ b/avr/modules/lcd2/gui2/base/mainwindow.asm
@@ -286,7 +286,7 @@ MainWindow_ContentStyle:
  .dw DISPLAY_COLOR_BLACK      ; borderCol_activated
  .dw DISPLAY_COLOR_WHITE      ; shadowCol_activated
  
-  .db 1, 1                     ; outerBorderSize, innerBorderSize
+  .db 2, 1                     ; outerBorderSize, innerBorderSize
  .dw ili9341Font12x16_1*2     ; font
  .db 12, 16                   ; charWidth, charHeight

--- 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
--- a/avr/modules/lcd2/gui2/base/vlayout.asm
+++ b/avr/modules/lcd2/gui2/base/vlayout.asm
@@ -430,10 +430,10 @@ vLayoutFinalizeSpread_loop:
          rjmp vLayoutFinalizeSpread_next
        ; store pos
        std Y+WIDGET_OFFS_Y_LO, xl
-        std Y+WIDGET_OFFS_Y_LO, xh
+        std Y+WIDGET_OFFS_Y_HI, xh
        ; determine final height of child widget
        ldd r18, Y+WIDGET_OFFS_TMP_LO
-        ldd r19, Y+WIDGET_OFFS_TMP_LO
+        ldd r19, Y+WIDGET_OFFS_TMP_HI
        ldd r16, Y+WIDGET_OFFS_PACK
        andi r16, (1<<WIDGET_PACK_VSELF1_BIT) | (1<<WIDGET_PACK_VSELF0_BIT)
        cpi r16, (WIDGET_PACK_FILLED<<WIDGET_PACK_VSELF0_BIT)
--- a/avr/modules/lcd2/gui2/base/widget.asm
+++ b/avr/modules/lcd2/gui2/base/widget.asm
@@ -722,6 +722,7 @@ Widget_Clear:
  rcall Widget_ValidateDims           ; (r16, r17)
  tst r16
  breq Widget_Clear_l1
+  ; DEBUG
  ldi r16, LOW(DISPLAY_COLOR_RED)
  mov r2, r16
  ldi r16, HIGH(DISPLAY_COLOR_RED)
				`@@ -314,10 +314,5 @@ LayoutIncTmpOnMatchingPack_done:`








				`#endif`