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

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

Browse Source
This commit is contained in:
Martin Preuss
2026-03-09 02:08:33 +01:00
parent 92efebccf1
commit 0758579b43
11 changed files with 657 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
avr/modules/lcd2/gui2/base/label.asm
View File

@@ -35,8 +35,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 label text
; @clobbers any
@@ -62,8 +62,8 @@ Label_new_ret:
;
; @param Y address of widget
; @param X parent widget (if any)
; @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 label text
; @clobbers r16, r17, X
@@ -72,14 +72,6 @@ Label_Init:
push r21
; call base class
bigcall Widget_Init ; (r16, r17, X)
; clear widget-specific data
mov xl, yl
mov xh, yh
adiw xh:xl, LABEL_OFFS_BEGIN
clr r16
ldi r17, (LABEL_SIZE-LABEL_OFFS_BEGIN)
bigcall Utils_FillSram ; (r17, X)
pop r21
pop r20
@@ -138,8 +130,8 @@ Label_OnDraw:
bigcall Widget_Clear
rcall labelWriteText
ldd r16, Y+OBJECT_OFFS_OPTS_LO
andi r16, (1<<WIDGET_OPTSLO_BORDER_BIT)
ldd r16, Y+OBJECT_OFFS_OPTS
andi r16, (1<<WIDGET_OPTS_BORDER_BIT)
breq Label_OnDraw_done
bigcall Widget_DrawBorder
@@ -169,10 +161,17 @@ Label_OnGetDefaultWidth:
rcall labelCalcTextWidth
mov r18, r12
mov r19, r13
ldi r16, 2 ; add small border around text
add r18, r16
adc r19, r16
sub r19, r16
; add borders
ldd zl, Y+WIDGET_OFFS_STYLE_LO
ldd zh, Y+WIDGET_OFFS_STYLE_HI
adiw zh:zl, WIDGET_STYLE_OFFS_OUTERBORDERSIZE
lpm r20, Z
clr r21
add r18, r20 ; add border at begin
adc r19, r21
add r18, r20 ; add border at end
adc r19, r21
sec
ret
; @end
@@ -183,7 +182,6 @@ Label_OnGetDefaultWidth:
; @routine Label_OnGetDefaultHeight @global
;
; @param Y address of widget
; @param r17 value requested
; @param xl param1
; @param xh param2
; @return CFLAG set if signal handled
@@ -194,10 +192,17 @@ Label_OnGetDefaultHeight:
rcall Widget_GetCharHeight ; R16=char height
mov r18, r16
clr r19
ldi r16, 2 ; add small border around text
add r18, r16
adc r19, r16
sub r19, r16
; add borders
ldd zl, Y+WIDGET_OFFS_STYLE_LO
ldd zh, Y+WIDGET_OFFS_STYLE_HI
adiw zh:zl, WIDGET_STYLE_OFFS_OUTERBORDERSIZE
lpm r20, Z
clr r21
add r18, r20 ; add border at begin
adc r19, r21
add r18, r20 ; add border at end
adc r19, r21
sec
ret
; @end
@@ -231,12 +236,12 @@ labelWriteText_ret:
labelAlignTextXY:
rcall labelCalcTextWidth ; Z=text, R13:R12=text width (r16, r17, r18)
rcall Widget_AlignContentX ; (r8, r9, r10, r11, r12, r13, r14, r15, r16, r17, r18, r19, r20, r21, r22, r23, r24, r25)
rcall Widget_PackContentX ; R5:R4=X (r17, r18, r19, r20, r21)
rcall Widget_GetCharHeight ; R16=char height
mov r12, r16
clr r13
rcall Widget_AlignContentY ; (r8, r9, r10, r11, r12, r13, r14, r15, r16, r17, r18, r19, r20, r21, r22, r23, r24, r25)
rcall Widget_PackContentY ; R7:R6=Y (r17, r18, r19, r20, r21)
ret
; @end
@@ -274,7 +279,7 @@ labelCalcTextWidth_ret:
Label_DefaultSignalmap:
; header
.dw Widget_DefaultSignalmap ; next table to use
.dw Widget_DefaultSignalmap*2 ; next table to use
; entries
.db 0, WIDGET_SIGNAL_DRAW, LOW(Label_OnDraw), HIGH(Label_OnDraw)
.db WIDGET_VALUE_DEFAULT_WIDTH, WIDGET_SIGNAL_GETVALUE, LOW(Label_OnGetDefaultWidth), HIGH(Label_OnGetDefaultWidth)