From ffde6b0ddb51eaa97a13d4015352f52f6dac6e5e Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Sat, 7 Mar 2026 01:29:13 +0100 Subject: [PATCH] gui2: added MainWindow_GetContentWidget. --- avr/modules/lcd2/gui2/base/mainwindow.asm | 24 ++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/avr/modules/lcd2/gui2/base/mainwindow.asm b/avr/modules/lcd2/gui2/base/mainwindow.asm index e8ca06f..4788d76 100644 --- a/avr/modules/lcd2/gui2/base/mainwindow.asm +++ b/avr/modules/lcd2/gui2/base/mainwindow.asm @@ -79,6 +79,8 @@ MainWindow_Init: ldi r16, HIGH(MainWindow_DefaultSignalmap*2) std Y+OBJECT_OFFS_SIGNALMAP_HI, r16 + ; set style which has no spacing and no borders so needs no drawing because + ; the children fill the screen completely ldi r16, LOW(MainWindow_DefaultStyle) std Y+WIDGET_OFFS_STYLE_LO, r16 ldi r16, HIGH(MainWindow_DefaultStyle) @@ -93,6 +95,23 @@ MainWindow_Init: +; --------------------------------------------------------------------------- +; @routine MainWindow_GetContentWidget @global +; +; @param Y address of widget +; @param X parent widget (if any) +; @return CFLAG set, if found, cleared otherwise +; @return r19:r18 resulting object +; @clobbers r16 + +MainWindow_GetContentWidget: + ldi r16, 1 ; idx 0=title, 1=content + bigcall OBJ_GetChildAt + ret +; @end + + + ; *************************************************************************** @@ -248,6 +267,9 @@ MainWindow_TitleStyle: +; this is the defining style for most windows because normally +; the style of the parent will be propagated to newly created child widgets. + MainWindow_ContentStyle: .dw DISPLAY_COLOR_BLACK ; frontCol_norm .dw DISPLAY_COLOR_LIGHTGREY ; backCol_norm @@ -259,7 +281,7 @@ MainWindow_ContentStyle: .dw DISPLAY_COLOR_BLACK ; borderCol_activated .dw DISPLAY_COLOR_WHITE ; shadowCol_activated - .db 2, 1 ; outerBorderSize, innerBorderSize + .db 2, 2 ; outerBorderSize, innerBorderSize .dw ili9341Font12x16_1*2 ; font .db 12, 16 ; charWidth, charHeight