c03, gui2: new GUI now basically works.
This commit is contained in:
@@ -243,42 +243,10 @@ onEveryLoop:
|
||||
|
||||
|
||||
test:
|
||||
clr r16
|
||||
sts guiApp, r16
|
||||
sts guiApp+1, r16
|
||||
|
||||
ldi r16, 0
|
||||
ldi r17, 0
|
||||
bigcall GuiApp_new
|
||||
bigcall C03App_new
|
||||
sts guiApp, yl
|
||||
sts guiApp+1, yh
|
||||
|
||||
push yl
|
||||
push yh
|
||||
bigcall ClimateWin_new
|
||||
; rcall mkTestWindow
|
||||
mov xl, yl
|
||||
mov xh, yh
|
||||
pop yh
|
||||
pop yl
|
||||
brcc DEBUG_STOP2
|
||||
|
||||
push xl
|
||||
push xh
|
||||
bigcall GuiApp_EnterWindow
|
||||
pop xh
|
||||
pop xl
|
||||
brcc DEBUG_STOP3
|
||||
|
||||
push yl
|
||||
push yh
|
||||
mov yl, xl
|
||||
mov yh, xh
|
||||
ldi r16, (1<<WIDGET_FLAGS_VISIBLE_BIT) | (1<<WIDGET_FLAGS_DIRTY_BIT) | (1<<WIDGET_FLAGS_LAYOUT_BIT)
|
||||
bigcall OBJ_AddFlagsUp
|
||||
pop yh
|
||||
pop yl
|
||||
|
||||
|
||||
ret
|
||||
|
||||
|
||||
@@ -367,7 +335,7 @@ mkTestWindow_ret:
|
||||
mkTestWidgets:
|
||||
ldi r16, (1<<WIDGET_OPTS_BORDER_BIT) ; OPT
|
||||
ldi r17, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_FILLED<<WIDGET_PACK_VSELF0_BIT) ; PACK
|
||||
ldi r20, HLAYOUT_MODE_COLUMNS
|
||||
ldi r20, MLAYOUT_MODE_COLUMNS
|
||||
ldi r21, 3
|
||||
bigcall MLayout_new
|
||||
sts mLayoutWidget, yl
|
||||
@@ -596,6 +564,8 @@ GUI2_MODULE_BEGIN:
|
||||
GUI2_MODULE_END:
|
||||
.equ MODULE_SIZE_GUI2 = GUI2_MODULE_END-GUI2_MODULE_BEGIN
|
||||
|
||||
.include "a_c03.asm"
|
||||
.include "w_menu.asm"
|
||||
.include "w_climate.asm"
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user