gui: fixed CFLAG return value.
This commit is contained in:
@@ -75,6 +75,7 @@ HLayout_Init:
|
|||||||
; call base class
|
; call base class
|
||||||
bigcall Widget_Init ; (r16, r17, X)
|
bigcall Widget_Init ; (r16, r17, X)
|
||||||
pop r20
|
pop r20
|
||||||
|
brcc HLayout_Init_ret
|
||||||
|
|
||||||
; set widget-specific data
|
; set widget-specific data
|
||||||
std Y+HLAYOUT_OFFS_MODE, r20
|
std Y+HLAYOUT_OFFS_MODE, r20
|
||||||
@@ -85,6 +86,7 @@ HLayout_Init:
|
|||||||
ldi r16, HIGH(HLayout_DefaultSignalmap*2)
|
ldi r16, HIGH(HLayout_DefaultSignalmap*2)
|
||||||
std Y+OBJECT_OFFS_SIGNALMAP_HI, r16
|
std Y+OBJECT_OFFS_SIGNALMAP_HI, r16
|
||||||
|
|
||||||
|
HLayout_Init_ret:
|
||||||
ret
|
ret
|
||||||
; @end
|
; @end
|
||||||
|
|
||||||
|
|||||||
@@ -128,6 +128,7 @@ OBJ_Init:
|
|||||||
std Y+OBJECT_OFFS_SIGNALMAP_LO, r16
|
std Y+OBJECT_OFFS_SIGNALMAP_LO, r16
|
||||||
ldi r16, HIGH(Object_DefaultSignalmap*2)
|
ldi r16, HIGH(Object_DefaultSignalmap*2)
|
||||||
std Y+OBJECT_OFFS_SIGNALMAP_HI, r16
|
std Y+OBJECT_OFFS_SIGNALMAP_HI, r16
|
||||||
|
sec
|
||||||
ret
|
ret
|
||||||
; @end
|
; @end
|
||||||
|
|
||||||
|
|||||||
@@ -156,6 +156,7 @@ Widget_Init:
|
|||||||
pop r17
|
pop r17
|
||||||
pop xh
|
pop xh
|
||||||
pop xl
|
pop xl
|
||||||
|
brcc Widget_Init_ret
|
||||||
|
|
||||||
std Y+WIDGET_OFFS_PACK, r17
|
std Y+WIDGET_OFFS_PACK, r17
|
||||||
|
|
||||||
@@ -208,6 +209,7 @@ Widget_Init_setDefaultSize:
|
|||||||
ldd r16, Y+OBJECT_OFFS_FLAGS
|
ldd r16, Y+OBJECT_OFFS_FLAGS
|
||||||
sbr r16, (1<<WIDGET_FLAGS_DIRTY_BIT) | (1<<WIDGET_FLAGS_LAYOUT_BIT)
|
sbr r16, (1<<WIDGET_FLAGS_DIRTY_BIT) | (1<<WIDGET_FLAGS_LAYOUT_BIT)
|
||||||
std Y+OBJECT_OFFS_FLAGS, r16
|
std Y+OBJECT_OFFS_FLAGS, r16
|
||||||
|
sec
|
||||||
|
|
||||||
Widget_Init_ret:
|
Widget_Init_ret:
|
||||||
ret
|
ret
|
||||||
@@ -356,6 +358,22 @@ Widget_SetValue:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ---------------------------------------------------------------------------
|
||||||
|
; @routine Widget_GetValue @global
|
||||||
|
;
|
||||||
|
; @param Y address of widget
|
||||||
|
; @param r17 value id
|
||||||
|
; @return CFLAG set if value retrieved, cleared otherwise
|
||||||
|
; @return r19:r18 value
|
||||||
|
; @clobbers any, !Y
|
||||||
|
|
||||||
|
Widget_GetValue:
|
||||||
|
ldi r16, WIDGET_SIGNAL_GETVALUE
|
||||||
|
bigjmp OBJ_HandleSignal
|
||||||
|
; @end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
; ---------------------------------------------------------------------------
|
; ---------------------------------------------------------------------------
|
||||||
; @routine Widget_IsPointInRect @global
|
; @routine Widget_IsPointInRect @global
|
||||||
;
|
;
|
||||||
|
|||||||
Reference in New Issue
Block a user