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

gui2: renamed *layout2* to *layout*

Browse Source
This commit is contained in:
Martin Preuss
2026-04-12 17:10:15 +02:00
parent 98f1ab779d
commit 5fe4b4b705
8 changed files with 176 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
avr/modules/lcd2/gui2/base/mainwindow.asm
View File

@@ -14,7 +14,7 @@
; ***************************************************************************
; defines
.equ MAINWINDOW_OFFS_BEGIN = VLAYOUT2_SIZE
.equ MAINWINDOW_OFFS_BEGIN = VLAYOUT_SIZE
; no data for now
.equ MAINWINDOW_SIZE = MAINWINDOW_OFFS_BEGIN+0
@@ -74,8 +74,8 @@ MainWindow_Init:
push r20
push r21
; call base class
ldi r20, VLAYOUT2_MODE_EXPAND
bigcall VLayout2_Init ; (r16, r17, X)
ldi r20, VLAYOUT_MODE_EXPAND
bigcall VLayout_Init ; (r16, r17, X)
pop r21
pop r20
@@ -235,8 +235,8 @@ mainWindowCreateContentWidget:
mov xh, yh
ldi r16, 0 ; OPTS
ldi r17, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_FILLED<<WIDGET_PACK_VSELF0_BIT) ; PACK
ldi r20, VLAYOUT2_MODE_EXPAND
bigcall VLayout2_new
ldi r20, VLAYOUT_MODE_EXPAND
bigcall VLayout_new
brcc mainWindowCreateContentWidget_done
; set style for title widget
ldi r16, LOW(MainWindow_ContentStyle*2)
@@ -258,7 +258,7 @@ mainWindowCreateContentWidget_done:
MainWindow_DefaultSignalmap:
; header
.dw VLayout2_DefaultSignalmap*2 ; next table to use
.dw VLayout_DefaultSignalmap*2 ; next table to use
; entries
.db 0, WIDGET_SIGNAL_DRAW, LOW(Widget_OnDrawNop), HIGH(Widget_OnDrawNop)
.db WIDGET_VALUE_DEFAULT_WIDTH, WIDGET_SIGNAL_GETVALUE, LOW(MainWindow_OnGetDefaultWidth), HIGH(MainWindow_OnGetDefaultWidth)