martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Martin Preuss
2026-03-11 19:53:19 +01:00
parent f6736c345d
commit 092c667291
10 changed files with 90 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
avr/modules/lcd2/gui2/base/hlayout.asm
View File

@@ -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