gui2: fixed problems with layouts

need to look into spread mode, too.

avr/modules/lcd2/gui2/base/hlayout.asm

@@ -42,12 +42,15 @@
 ; @param X parent widget
 ; @param r16 value for OBJECT_OFFS_OPTS
 ; @param r17 value for WIDGET_OFFS_PACK
+; @param r20 layout mode (HLAYOUT_MODE_EXPAND, HLAYOUT_MODE_SPREAD)
 ; @clobbers any
 
 HLayout_new:
-  ldi r24, LOW(HLAYOUT_SIZE)
-  ldi r25, HIGH(HLAYOUT_SIZE)
-  bigcall Object_Alloc         ; (!r16, !r17, !X)
+  push r20
+    ldi r24, LOW(HLAYOUT_SIZE)
+    ldi r25, HIGH(HLAYOUT_SIZE)
+    bigcall Object_Alloc         ; (!r16, !r17, !X)
+  pop r20
   brcc HLayout_new_ret
   rcall HLayout_Init               ; (r16, r17, X)
   sec
@@ -64,16 +67,18 @@ HLayout_new_ret:
 ; @param X parent widget (if any)
 ; @param r16 value for OBJECT_OFFS_OPTS
 ; @param r17 value for WIDGET_OFFS_PACK
+; @param r20 layout mode (HLAYOUT_MODE_EXPAND, HLAYOUT_MODE_SPREAD)
 ; @clobbers r16, r17, X
 
 HLayout_Init:
   push r20
-    push r21
-      ; call base class
-      bigcall Widget_Init             ; (r16, r17, X)
-    pop r21
+    ; call base class
+    bigcall Widget_Init             ; (r16, r17, X)
   pop r20
 
+  ; set widget-specific data
+  std Y+HLAYOUT_OFFS_MODE, r20
+
   ; set default signal map
   ldi r16, LOW(HLayout_DefaultSignalmap*2)
   std Y+OBJECT_OFFS_SIGNALMAP_LO, r16
@@ -94,6 +99,7 @@ HLayout_Init:
 HLayout_OnLayout:
   rcall hLayoutHorizontally
   rcall hLayoutVertically
+
   ; force re-drawing of this widget, clear layout bit
   ldd r16, Y+OBJECT_OFFS_FLAGS
   sbr r16, (1<<WIDGET_FLAGS_DIRTY_BIT)
@@ -214,7 +220,8 @@ hLayoutVertically:
   ldd zh, Y+WIDGET_OFFS_STYLE_HI
   adiw zh:zl, WIDGET_STYLE_OFFS_OUTERBORDERSIZE
   lpm r18, Z+
-  lpm r19, Z
+;  lpm r19, Z
+  clr r19
   sub r22, r18
   sbc r23, r19
   sub r22, r18
@@ -356,13 +363,19 @@ hLayoutPrepareSpread:
 
   ldd r18, Y+WIDGET_OFFS_WIDTH_LO
   ldd r19, Y+WIDGET_OFFS_WIDTH_HI
-  sub r18, r20
-  sbc r19, r21                                                       
+  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
+  inc r16                                                 ; r16=number of spacings (begin->between->end)
   mov r22, r16
   push r22
     ldi r22, (1<<WIDGET_PACK_HSELF1_BIT) | \
@@ -370,12 +383,13 @@ hLayoutPrepareSpread:
     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
+  add r22, r16                                            ; r22=number of items to spread
   clr r23
   bigcall Utils_Divu16_16_16                              ; r17:r16=space per element
-  mov r20, r18
-  mov r21, r19                                            ; r21:20=additional 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