gui2: more work (vlayout doesn't work, yet).

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

@@ -34,8 +34,8 @@
 ; @return CFLAG set of okay, cleared otherwise
 ; @return Y address of newly created object
 ; @param X parent widget
-; @param r16 value for OBJECT_OFFS_OPTS_LO
-; @param r17 value for OBJECT_OFFS_OPTS_HI
+; @param r16 value for OBJECT_OFFS_OPTS
+; @param r17 value for WIDGET_OFFS_PACK
 ; @param r21:r20 ressource id for title
 ; @clobbers any
 
@@ -127,21 +127,21 @@ HLayout_OnGetDefaultWidth:
 
 HLayout_OnGetDefaultHeight:
   rcall Layout_SetDefaultHeights
-  rcall Layout_GetMaxTmp
+  rcall Layout_GetMaxTmp                          ; r19:r18=max tmp value (r20, r21)
 
   ; get outer border
   ldd zl, Y+WIDGET_OFFS_STYLE_LO
   ldd zh, Y+WIDGET_OFFS_STYLE_HI
   adiw zh:zl, WIDGET_STYLE_OFFS_OUTERBORDERSIZE
-  lpm r16, Z
-  clr r17
+  lpm r20, Z
+  clr r21
   sbiw zh:zl, WIDGET_STYLE_OFFS_OUTERBORDERSIZE
   
-  add r18, r16  ; add outer border (top)
-  adc r19, r17
+  add r18, r20  ; add outer border (top)
+  adc r19, r21
 
-  add r18, r16  ; add outer border (bottom)
-  adc r19, r17
+  add r18, r20  ; add outer border (bottom)
+  adc r19, r21
   
   sec
   ret
@@ -156,51 +156,6 @@ HLayout_OnGetDefaultHeight:
 ; @clobbers r16, r17, r18, r19, r20, r21, r22, r23, Z
 
 hLayoutSetX:
-  ldd zl, Y+WIDGET_OFFS_STYLE_LO
-  ldd zh, Y+WIDGET_OFFS_STYLE_HI
-
-  ; get spacing
-  adiw zh:zl, WIDGET_STYLE_OFFS_SPACING
-  lpm r22, Z
-  clr r23
-  sbiw zh:zl, WIDGET_STYLE_OFFS_SPACING
-  ; get outer border
-  adiw zh:zl, WIDGET_STYLE_OFFS_OUTERBORDERSIZE
-  lpm r20, Z
-  clr r21
-  sbiw zh:zl, WIDGET_STYLE_OFFS_OUTERBORDERSIZE
-
-  push yl
-    push yh
-      bigcall OBJ_GetFirstChild
-hLayoutSetX_loop:
-        brcc hLayoutSetX_loopEnd
-        mov yl, r18
-        mov yh, r19
-        ; set X
-        std Y+WIDGET_OFFS_X_LO, r20
-        std Y+WIDGET_OFFS_X_HI, r21
-        ; set width
-        ldd r16, Y+WIDGET_OFFS_TMP_LO
-        ldd r17, Y+WIDGET_OFFS_TMP_HI
-        std Y+WIDGET_OFFS_WIDTH_LO, r16
-        std Y+WIDGET_OFFS_WIDTH_HI, r17
-        ; advance r21:r20
-        add r20, r16    ; add widget size
-        adc r21, r17
-        add r20, r22    ; add spacing
-        adc r21, r23
-
-        ; force direct children to re-layout and re-draw
-        ldd r16, Y+OBJECT_OFFS_FLAGS
-        ori r16, (1<<WIDGET_FLAGS_DIRTY_BIT) | (1<<WIDGET_FLAGS_LAYOUT_BIT)
-        std Y+OBJECT_OFFS_FLAGS, r16
-
-        rcall OBJ_GetNext
-      rjmp hLayoutSetX_loop
-hLayoutSetX_loopEnd:
-    pop yh
-  pop yl
   ret
 ; @end
 
@@ -213,87 +168,12 @@ hLayoutSetX_loopEnd:
 ; @clobbers r17, r18, r19, r20, r21, r22, r23, Z
 
 hLayoutVerticalAdjust:
-  bigcall Layout_SetDefaultHeights
-  
-  ldd zl, Y+WIDGET_OFFS_STYLE_LO
-  ldd zh, Y+WIDGET_OFFS_STYLE_HI
-
-  ; get outer border
-  adiw zh:zl, WIDGET_STYLE_OFFS_OUTERBORDERSIZE
-  lpm r20, Z
-  clr r21
-  sbiw zh:zl, WIDGET_STYLE_OFFS_OUTERBORDERSIZE
-
-  ldd r22, Y+WIDGET_OFFS_HEIGHT_LO
-  ldd r23, Y+WIDGET_OFFS_HEIGHT_HI
-  sub r22, r20   ; subtract border (top)
-  sbc r23, r21
-  sub r22, r20   ; subtract border (bottom)
-  sbc r23, r21
-
-  push yl
-    push yh
-      bigcall OBJ_GetFirstChild
-hLayoutVerticalAdjust_loop:
-        brcc hLayoutVerticalAdjust_loopEnd
-        mov yl, r18
-        mov yh, r19
-        std Y+WIDGET_OFFS_Y_LO, r20
-        std Y+WIDGET_OFFS_Y_HI, r21
-        
-        ldd r18, Y+WIDGET_OFFS_TMP_LO
-        ldd r19, Y+WIDGET_OFFS_TMP_HI
-        
-        ldd r17, Y+OBJECT_OFFS_OPTS_LO
-        sbrs r17, WIDGET_OPTSLO_FILLY_BIT
-          rjmp hLayoutVerticalAdjust_setHeight
-        mov r18, r22                          ; increase height to full height
-        mov r19, r23
-hLayoutVerticalAdjust_setHeight:
-        std Y+WIDGET_OFFS_HEIGHT_LO, r18
-        std Y+WIDGET_OFFS_HEIGHT_HI, r19
-        rcall OBJ_GetNext
-      rjmp hLayoutVerticalAdjust_loop
-hLayoutVerticalAdjust_loopEnd:
-    pop yh
-  pop yl
   ret
 ; @end
 
 
 
 hLayoutHorizontally:
-  rcall Layout_SetDefaultWidths
-  rcall Layout_SumTmpValues         ; r21:r20=width
-
-  ldd r22, Y+WIDGET_OFFS_WIDTH_LO
-  ldd r23, Y+WIDGET_OFFS_WIDTH_HI
-  sub r22, r20
-  sbc r23, r21
-  breq hLayoutHorizontally_setX
-  brcs hLayoutHorizontally_setX
-
-  ; r23:r22=remaining space to distribute
-  push r22
-    ldi r22, (1<<WIDGET_OPTSLO_FILLX_BIT)
-    rcall LayoutCountExpandableChildren ; r16=number of expandable child widgets
-  pop r22
-  tst r16
-  breq hLayoutHorizontally_setX
-
-  ; calc space to add to each expandable child widget and add it
-  mov r20, r22
-  mov r21, r23
-  mov r22, r16
-  clr r23
-  bigcall Utils_Divu16_16_16 ; r17:r16=space per expandable child widget
-  mov r20, r16
-  mov r21, r17
-  ldi r22, (1<<WIDGET_OPTSLO_FILLX_BIT)
-  rcall Layout_AddToTmpOfFillXChildren
-
-hLayoutHorizontally_setX:
-  rcall hLayoutSetX
   ret
 ; @end
 
@@ -306,7 +186,7 @@ hLayoutHorizontally_setX:
 
 HLayout_DefaultSignalmap:
   ; header
-  .dw Widget_DefaultSignalmap  ; next table to use
+  .dw Widget_DefaultSignalmap*2  ; next table to use
   ; entries
   .db 0,                           WIDGET_SIGNAL_LAYOUT,   LOW(HLayout_OnLayout),           HIGH(HLayout_OnLayout)
   .db WIDGET_VALUE_DEFAULT_WIDTH,  WIDGET_SIGNAL_GETVALUE, LOW(HLayout_OnGetDefaultWidth),  HIGH(HLayout_OnGetDefaultWidth)