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

gui2: fixed problems with layouts

Browse Source 
need to look into spread mode, too.
This commit is contained in:
Martin Preuss
2026-03-11 00:32:08 +01:00
parent 282cd738b4
commit 51cedae0cb
10 changed files with 493 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
avr/modules/lcd2/gui2/base/vlayout.asm
View File

@@ -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 (VLAYOUT_MODE_EXPAND, VLAYOUT_MODE_SPREAD)
; @clobbers any
VLayout_new:
ldi r24, LOW(VLAYOUT_SIZE)
ldi r25, HIGH(VLAYOUT_SIZE)
bigcall Object_Alloc ; (!r16, !r17, !X)
push r20
ldi r24, LOW(VLAYOUT_SIZE)
ldi r25, HIGH(VLAYOUT_SIZE)
bigcall Object_Alloc ; (!r16, !r17, !X)
pop r20
brcc VLayout_new_ret
rcall VLayout_Init ; (r16, r17, X)
sec
@@ -64,16 +67,18 @@ VLayout_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 (VLAYOUT_MODE_EXPAND, VLAYOUT_MODE_SPREAD)
; @clobbers r16, r17, X
VLayout_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+VLAYOUT_OFFS_MODE, r20
; set default signal map
ldi r16, LOW(VLayout_DefaultSignalmap*2)
std Y+OBJECT_OFFS_SIGNALMAP_LO, r16
@@ -115,21 +120,7 @@ VLayout_OnLayout:
VLayout_OnGetDefaultWidth:
rcall Layout_SetDefaultWidths
rcall Layout_GetMaxTmp
; 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
sbiw zh:zl, WIDGET_STYLE_OFFS_OUTERBORDERSIZE
add r18, r16 ; add outer border (top)
adc r19, r17
add r18, r16 ; add outer border (bottom)
adc r19, r17
bigcall Widget_AddOuterStyleBorders ; (r20, r21)
sec
ret
@@ -228,7 +219,8 @@ vLayoutHorizontally:
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
@@ -244,14 +236,14 @@ vLayoutHorizontally_loop:
mov yl, r18
mov yh, r19
ldd r12, Y+WIDGET_OFFS_TMP_LO
ldd r12, Y+WIDGET_OFFS_TMP_LO ; default width
ldd r13, Y+WIDGET_OFFS_TMP_HI
ldd r17, Y+WIDGET_OFFS_PACK
andi r17, (1<<WIDGET_PACK_HSELF1_BIT) | (1<<WIDGET_PACK_HSELF0_BIT)
cpi r17, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT)
brne vLayoutHorizontally_setWidth
mov r12, r22
mov r12, r22 ; TODO: need to check size, subtract borders!!!
mov r13, r23
vLayoutHorizontally_setWidth:
std Y+WIDGET_OFFS_WIDTH_LO, r12
@@ -261,7 +253,7 @@ vLayoutHorizontally_setWidth:
ldd r17, Y+WIDGET_OFFS_PACK
mov yl, xl ; use parent
mov yh, xh
rcall Widget_PackSelfX ; R5:R4=new pos (r17, r18, r19, r20, r21)
rcall Widget_PackSelfX ; R5:R4=new pos (r17, r18, r19, r20, r21) !! TODO: ERROR when FILLED !!
pop yh
pop yl
std Y+WIDGET_OFFS_X_LO, r4
@@ -372,6 +364,11 @@ vLayoutPrepareSpread:
ldd r19, Y+WIDGET_OFFS_HEIGHT_HI
sub r18, r20
sbc r19, r21
brcc vLayoutPrepareSpread_calcAdd
clr r20
clr r21
rjmp vLayoutPrepareSpread_finish
vLayoutPrepareSpread_calcAdd:
mov r20, r18
mov r21, r19 ; remaining space
@@ -387,9 +384,10 @@ vLayoutPrepareSpread:
add r22, r16
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
vLayoutPrepareSpread_finish:
; get and adjust spacing, setup start pos
ldd zl, Y+WIDGET_OFFS_STYLE_LO
ldd zh, Y+WIDGET_OFFS_STYLE_HI