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

more work on dialog class.

Browse Source
This commit is contained in:
Martin Preuss
2026-07-13 23:24:32 +02:00
parent 0675538258
commit 56831ac53d
1 changed files with 62 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
avr/modules/lcd2/gui/composite/dialog.asm
View File

@@ -16,7 +16,9 @@
; DIALOG data
.equ DIALOG_OFFS_BEGIN = MAINWINDOW_SIZE
.equ DIALOG_SIZE = DIALOG_OFFS_BEGIN+0
.equ DIALOG_OFFS_CURRSUBDLG_LO = DIALOG_OFFS_BEGIN+0
.equ DIALOG_OFFS_CURRSUBDLG_HI = DIALOG_OFFS_BEGIN+1
.equ DIALOG_SIZE = DIALOG_OFFS_BEGIN+2
.equ DIALOG_OPTS_STDBTNS_BIT = 0 ; use standard buttons
@@ -157,6 +159,65 @@ Dialog_RmContent:
; ---------------------------------------------------------------------------
; @routine Dialog_EnterSubDialog
; @param Y pointer to dialog
; @param X pointer to new dialog to enter
; @clobbers any, !Y
Dialog_EnterSubDialog:
std Y+DIALOG_OFFS_CURRSUBDLG_LO, xl
std Y+DIALOG_OFFS_CURRSUBDLG_HI, xh
adiw xh:xl, OBJECT_OFFS_TARGET_LO
st X+, yl
st X, yh
sbiw xh:xl, (OBJECT_OFFS_TARGET_LO+1)
push yl
push yh
bigcall Widget_GetApp ; R19:R18=gui (none)
mov yl, r18
mov yh, r19
bigcall GuiApp_EnterWindow
pop yh
pop yl
ret
; @end
; ---------------------------------------------------------------------------
; @routine Dialog_LeaveSubDialog
; @param Y pointer to dialog
; @clobbers any, !Y
Dialog_LeaveSubDialog:
; leave sub-dialog
push yl
push yh
bigcall Widget_GetApp ; R19:R18=gui
mov yl, r18
mov yh, r19
bigcall GuiApp_LeaveWindow
pop yh
pop yl
; mark sub-dialog for destruction
ldd xl, Y+DIALOG_OFFS_CURRSUBDLG_LO
ldd xh, Y+DIALOG_OFFS_CURRSUBDLG_HI
clr r16
std Y+DIALOG_OFFS_CURRSUBDLG_LO, r16
std Y+DIALOG_OFFS_CURRSUBDLG_HI, r16
adiw xh:xl, OBJECT_OFFS_FLAGS
ld r16, X
sbr r16, (1<<OBJECT_FLAGS_DESTROY_BIT)
st X, r16
ret
; @end
; ***************************************************************************