gui2: added widgets.
This commit is contained in:
@@ -250,7 +250,6 @@ test:
|
||||
ldi r16, 0
|
||||
ldi r17, 0
|
||||
bigcall GuiApp_new
|
||||
brcc DEBUG_STOP
|
||||
sts guiApp, yl
|
||||
sts guiApp+1, yh
|
||||
|
||||
@@ -273,20 +272,43 @@ test:
|
||||
push xh
|
||||
mov xl, r18
|
||||
mov xh, r19
|
||||
|
||||
push xl ; content window
|
||||
push xh
|
||||
ldi r16, (1<<OBJECT_OPTS_TIMER_BIT) | (1<<WIDGET_OPTS_INPUT_BIT) ; OPTS
|
||||
ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_BEGIN<<WIDGET_PACK_VSELF0_BIT) ; PACK
|
||||
ldi r20, BUTTON_MODE_NORMAL
|
||||
bigcall Button_new
|
||||
mov xl, yl
|
||||
mov xh, yh
|
||||
|
||||
ldi r16, (1<<WIDGET_OPTS_BORDER_BIT)
|
||||
ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_BEGIN<<WIDGET_PACK_VSELF0_BIT) |\
|
||||
(WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | (WIDGET_PACK_BEGIN<<WIDGET_PACK_VCONTENT0_BIT)
|
||||
ldi r20, LOW(RESSSOURCE_TXT_BUERO)
|
||||
ldi r21, HIGH(RESSSOURCE_TXT_BUERO)
|
||||
bigcall Label_new
|
||||
pop xh
|
||||
pop xl
|
||||
|
||||
push xl
|
||||
push xh
|
||||
ldi r16, (1<<OBJECT_OPTS_TIMER_BIT) | (1<<WIDGET_OPTS_INPUT_BIT) ; OPTS
|
||||
ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_BEGIN<<WIDGET_PACK_VSELF0_BIT) ; PACK
|
||||
ldi r20, BUTTON_MODE_NORMAL
|
||||
bigcall Button_new
|
||||
mov xl, yl
|
||||
mov xh, yh
|
||||
|
||||
ldi r16, (1<<WIDGET_OPTS_BORDER_BIT)
|
||||
ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_BEGIN<<WIDGET_PACK_VSELF0_BIT) |\
|
||||
(WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | (WIDGET_PACK_BEGIN<<WIDGET_PACK_VCONTENT0_BIT)
|
||||
ldi r20, LOW(RESSSOURCE_IMG_TEMP96)
|
||||
ldi r21, HIGH(RESSSOURCE_IMG_TEMP96)
|
||||
bigcall ImageView_new
|
||||
pop xh
|
||||
pop xl
|
||||
|
||||
ldi r16, (1<<OBJECT_OPTS_TIMER_BIT) | (1<<WIDGET_OPTS_INPUT_BIT) ; OPTS
|
||||
ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_BEGIN<<WIDGET_PACK_VSELF0_BIT) ; PACK
|
||||
ldi r20, BUTTON_MODE_NORMAL
|
||||
bigcall Button_new
|
||||
mov xl, yl
|
||||
mov xh, yh
|
||||
|
||||
ldi r16, (1<<WIDGET_OPTS_BORDER_BIT)
|
||||
ldi r17, (WIDGET_PACK_BEGIN<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_BEGIN<<WIDGET_PACK_VSELF0_BIT) |\
|
||||
(WIDGET_PACK_BEGIN<<WIDGET_PACK_HCONTENT0_BIT) | (WIDGET_PACK_BEGIN<<WIDGET_PACK_VCONTENT0_BIT)
|
||||
ldi r20, LOW(RESSSOURCE_TXT_BUERO)
|
||||
ldi r21, HIGH(RESSSOURCE_TXT_BUERO)
|
||||
bigcall Label_new
|
||||
pop xh
|
||||
pop xl
|
||||
pop yh
|
||||
@@ -353,6 +375,8 @@ DEBUG_STOP3:
|
||||
.include "modules/lcd2/gui2/base/rootwindow.asm"
|
||||
.include "modules/lcd2/gui2/base/label.asm"
|
||||
.include "modules/lcd2/gui2/base/button.asm"
|
||||
.include "modules/lcd2/gui2/base/imageview.asm"
|
||||
.include "modules/lcd2/gui2/base/valuelabel.asm"
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user