diff --git a/avr/devices/c03/main/w_lightsettings.asm b/avr/devices/c03/main/w_lightsettings.asm index 175629a..bf8183d 100644 --- a/avr/devices/c03/main/w_lightsettings.asm +++ b/avr/devices/c03/main/w_lightsettings.asm @@ -155,6 +155,7 @@ LightSettingsWin_OnDestroy_done: LightSettingsWin_Config: .db CWIDGETCFG_MAINWIDGET_TYPE_MLAYOUT, 0 ; TYPE, FLAGS + .dw 0 ; STYLE .db 2, 0 ; PARAM1, PARAM2 ; line 1, left widget diff --git a/avr/modules/lcd2/gui/aqhome/d_nodevalueid.asm b/avr/modules/lcd2/gui/aqhome/d_nodevalueid.asm index 6cf0e59..a06e521 100644 --- a/avr/modules/lcd2/gui/aqhome/d_nodevalueid.asm +++ b/avr/modules/lcd2/gui/aqhome/d_nodevalueid.asm @@ -233,6 +233,7 @@ DlgNodeValueId_OnDialogEnd: ; dialog setup data DlgNodeValueId_Config: .db CWIDGETCFG_MAINWIDGET_TYPE_MLAYOUT, 0 ; TYPE, FLAGS + .dw 0 ; STYLE .db 2, 0 ; PARAM1, PARAM2 ; line 1, left widget diff --git a/avr/modules/lcd2/gui/base/cwidget.asm b/avr/modules/lcd2/gui/base/cwidget.asm index 49f4768..3125ee8 100644 --- a/avr/modules/lcd2/gui/base/cwidget.asm +++ b/avr/modules/lcd2/gui/base/cwidget.asm @@ -33,9 +33,11 @@ .equ CWIDGETCFG_OFFS_HEADER_TYPE = 0 ; HLAYOUT, VLAYOUT, MLAYOUT .equ CWIDGETCFG_OFFS_HEADER_FLAGS = 1 -.equ CWIDGETCFG_OFFS_HEADER_PARAM1 = 2 ; R20 -.equ CWIDGETCFG_OFFS_HEADER_PARAM2 = 3 ; R21 -.equ CWIDGETCFG_HEADER_SIZE = 4 +.equ CWIDGETCFG_OFFS_HEADER_STYLE_LO = 2 +.equ CWIDGETCFG_OFFS_HEADER_STYLE_HI = 3 +.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_FLAGS = 1 @@ -160,6 +162,22 @@ cWidgetMkMainWidget: rcall cWidgetMkMainWidget_callTable pop zh 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: ret cWidgetMkMainWidget_callTable: