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

gui: allow for style setting in parent of configured widgets.

Browse Source
This commit is contained in:
Martin Preuss
2026-05-08 10:15:46 +02:00
parent d236c9571e
commit b0d9c46d87
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
avr/devices/c03/main/w_lightsettings.asm
View File

@@ -155,6 +155,7 @@ LightSettingsWin_OnDestroy_done:
LightSettingsWin_Config: LightSettingsWin_Config:
.db CWIDGETCFG_MAINWIDGET_TYPE_MLAYOUT, 0 ; TYPE, FLAGS .db CWIDGETCFG_MAINWIDGET_TYPE_MLAYOUT, 0 ; TYPE, FLAGS
.dw 0 ; STYLE
.db 2, 0 ; PARAM1, PARAM2 .db 2, 0 ; PARAM1, PARAM2
; line 1, left widget ; line 1, left widget

1
avr/modules/lcd2/gui/aqhome/d_nodevalueid.asm
View File

@@ -233,6 +233,7 @@ DlgNodeValueId_OnDialogEnd:
; dialog setup data ; dialog setup data
DlgNodeValueId_Config: DlgNodeValueId_Config:
.db CWIDGETCFG_MAINWIDGET_TYPE_MLAYOUT, 0 ; TYPE, FLAGS .db CWIDGETCFG_MAINWIDGET_TYPE_MLAYOUT, 0 ; TYPE, FLAGS
.dw 0 ; STYLE
.db 2, 0 ; PARAM1, PARAM2 .db 2, 0 ; PARAM1, PARAM2
; line 1, left widget ; line 1, left widget

24
avr/modules/lcd2/gui/base/cwidget.asm
View File

@@ -33,9 +33,11 @@
.equ CWIDGETCFG_OFFS_HEADER_TYPE = 0 ; HLAYOUT, VLAYOUT, MLAYOUT .equ CWIDGETCFG_OFFS_HEADER_TYPE = 0 ; HLAYOUT, VLAYOUT, MLAYOUT
.equ CWIDGETCFG_OFFS_HEADER_FLAGS = 1 .equ CWIDGETCFG_OFFS_HEADER_FLAGS = 1
.equ CWIDGETCFG_OFFS_HEADER_PARAM1 = 2 ; R20 .equ CWIDGETCFG_OFFS_HEADER_STYLE_LO = 2
.equ CWIDGETCFG_OFFS_HEADER_PARAM2 = 3 ; R21 .equ CWIDGETCFG_OFFS_HEADER_STYLE_HI = 3
.equ CWIDGETCFG_HEADER_SIZE = 4 .equ CWIDGETCFG_OFFS_HEADER_PARAM1 = 4 ; R20
.equ CWIDGETCFG_OFFS_HEADER_PARAM2 = 5 ; R21
.equ CWIDGETCFG_HEADER_SIZE = 6
.equ CWIDGETCFG_OFFS_WIDGET_TYPE = 0 ; 0=end .equ CWIDGETCFG_OFFS_WIDGET_TYPE = 0 ; 0=end
.equ CWIDGETCFG_OFFS_WIDGET_FLAGS = 1 .equ CWIDGETCFG_OFFS_WIDGET_FLAGS = 1
@@ -160,6 +162,22 @@ cWidgetMkMainWidget:
rcall cWidgetMkMainWidget_callTable rcall cWidgetMkMainWidget_callTable
pop zh pop zh
pop zl pop zl
brcc cWidgetMkMainWidget_ret
; set style (if any)
adiw zh:zl, CWIDGETCFG_OFFS_HEADER_STYLE_LO
lpm xl, Z+
lpm xh, Z
sbiw zh:zl, (CWIDGETCFG_OFFS_HEADER_STYLE_LO+1)
mov r18, xl
or r18, xh
sec
breq cWidgetMkMainWidget_ret
push zl
push zh
bigcall Widget_SetStyle
pop zh
pop zl
cWidgetMkMainWidget_ret: cWidgetMkMainWidget_ret:
ret ret
cWidgetMkMainWidget_callTable: cWidgetMkMainWidget_callTable: