gui2: added widgets.
This commit is contained in:
Martin Preuss
@@ -15,8 +15,14 @@
|
||||
; defines
|
||||
|
||||
.equ HLAYOUT_OFFS_BEGIN = WIDGET_SIZE
|
||||
; no data for now
|
||||
.equ HLAYOUT_SIZE = HLAYOUT_OFFS_BEGIN+0
|
||||
.equ HLAYOUT_OFFS_MODE = HLAYOUT_OFFS_BEGIN+0
|
||||
.equ HLAYOUT_SIZE = HLAYOUT_OFFS_BEGIN+1
|
||||
|
||||
|
||||
; values for HLAYOUT_OFFS_MODE
|
||||
.equ HLAYOUT_MODE_EXPAND = 0
|
||||
.equ HLAYOUT_MODE_SPREAD = 1
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -36,17 +42,12 @@
|
||||
; @param X parent widget
|
||||
; @param r16 value for OBJECT_OFFS_OPTS
|
||||
; @param r17 value for WIDGET_OFFS_PACK
|
||||
; @param r21:r20 ressource id for title
|
||||
; @clobbers any
|
||||
|
||||
HLayout_new:
|
||||
push r20
|
||||
push r21
|
||||
ldi r24, LOW(HLAYOUT_SIZE)
|
||||
ldi r25, HIGH(HLAYOUT_SIZE)
|
||||
bigcall Object_Alloc ; (!r16, !r17, !X)
|
||||
pop r21
|
||||
pop r20
|
||||
ldi r24, LOW(HLAYOUT_SIZE)
|
||||
ldi r25, HIGH(HLAYOUT_SIZE)
|
||||
bigcall Object_Alloc ; (!r16, !r17, !X)
|
||||
brcc HLayout_new_ret
|
||||
rcall HLayout_Init ; (r16, r17, X)
|
||||
sec
|
||||
@@ -61,6 +62,8 @@ HLayout_new_ret:
|
||||
;
|
||||
; @param Y address of widget
|
||||
; @param X parent widget (if any)
|
||||
; @param r16 value for OBJECT_OFFS_OPTS
|
||||
; @param r17 value for WIDGET_OFFS_PACK
|
||||
; @clobbers r16, r17, X
|
||||
|
||||
HLayout_Init:
|
||||
@@ -90,7 +93,7 @@ HLayout_Init:
|
||||
|
||||
HLayout_OnLayout:
|
||||
rcall hLayoutHorizontally
|
||||
rcall hLayoutVerticalAdjust
|
||||
rcall hLayoutVertically
|
||||
; force re-drawing of this widget, clear layout bit
|
||||
ldd r16, Y+OBJECT_OFFS_FLAGS
|
||||
sbr r16, (1<<WIDGET_FLAGS_DIRTY_BIT)
|
||||
@@ -102,6 +105,24 @@ HLayout_OnLayout:
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine HLayout_OnGetDefaultHeight
|
||||
;
|
||||
; @param Y pointer to widget
|
||||
; @return r19:r18 value
|
||||
; @clobbers any, !Y
|
||||
|
||||
HLayout_OnGetDefaultHeight:
|
||||
rcall Layout_SetDefaultHeights
|
||||
rcall Layout_GetMaxTmp
|
||||
bigcall Widget_AddOuterStyleBorders ; (r20, r21)
|
||||
sec
|
||||
ret
|
||||
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine HLayout_OnGetDefaultWidth
|
||||
;
|
||||
@@ -118,37 +139,6 @@ HLayout_OnGetDefaultWidth:
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine HLayout_OnGetDefaultHeight
|
||||
;
|
||||
; @param Y pointer to widget
|
||||
; @return r19:r18 value
|
||||
; @clobbers any, !Y
|
||||
|
||||
HLayout_OnGetDefaultHeight:
|
||||
rcall Layout_SetDefaultHeights
|
||||
rcall Layout_GetMaxTmp ; r19:r18=max tmp value (r20, r21)
|
||||
|
||||
; get outer border
|
||||
ldd zl, Y+WIDGET_OFFS_STYLE_LO
|
||||
ldd zh, Y+WIDGET_OFFS_STYLE_HI
|
||||
adiw zh:zl, WIDGET_STYLE_OFFS_OUTERBORDERSIZE
|
||||
lpm r20, Z
|
||||
clr r21
|
||||
sbiw zh:zl, WIDGET_STYLE_OFFS_OUTERBORDERSIZE
|
||||
|
||||
add r18, r20 ; add outer border (top)
|
||||
adc r19, r21
|
||||
|
||||
add r18, r20 ; add outer border (bottom)
|
||||
adc r19, r21
|
||||
|
||||
sec
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine hLayoutSetX
|
||||
;
|
||||
@@ -156,29 +146,307 @@ HLayout_OnGetDefaultHeight:
|
||||
; @clobbers r16, r17, r18, r19, r20, r21, r22, r23, Z
|
||||
|
||||
hLayoutSetX:
|
||||
ldd zl, Y+WIDGET_OFFS_STYLE_LO
|
||||
ldd zh, Y+WIDGET_OFFS_STYLE_HI
|
||||
|
||||
; get spacing
|
||||
adiw zh:zl, WIDGET_STYLE_OFFS_SPACING
|
||||
lpm r22, Z
|
||||
clr r23
|
||||
sbiw zh:zl, WIDGET_STYLE_OFFS_SPACING
|
||||
; get outer border
|
||||
adiw zh:zl, WIDGET_STYLE_OFFS_OUTERBORDERSIZE
|
||||
lpm r20, Z
|
||||
clr r21
|
||||
sbiw zh:zl, WIDGET_STYLE_OFFS_OUTERBORDERSIZE
|
||||
|
||||
push yl
|
||||
push yh
|
||||
bigcall OBJ_GetFirstChild
|
||||
brcc hLayoutSetX_loopEnd
|
||||
hLayoutSetX_loop:
|
||||
mov yl, r18
|
||||
mov yh, r19
|
||||
ldd r16, Y+OBJECT_OFFS_FLAGS
|
||||
sbrs r16, WIDGET_FLAGS_VISIBLE_BIT
|
||||
rjmp hLayoutSetX_next
|
||||
; set Y
|
||||
std Y+WIDGET_OFFS_X_LO, r20
|
||||
std Y+WIDGET_OFFS_X_HI, r21
|
||||
; set width
|
||||
ldd r16, Y+WIDGET_OFFS_TMP_LO
|
||||
ldd r17, Y+WIDGET_OFFS_TMP_HI
|
||||
std Y+WIDGET_OFFS_WIDTH_LO, r16
|
||||
std Y+WIDGET_OFFS_WIDTH_HI, r17
|
||||
; advance r21:r20
|
||||
add r20, r16 ; add widget size
|
||||
adc r21, r17
|
||||
add r20, r22 ; add spacing
|
||||
adc r21, r23
|
||||
|
||||
; force direct children to re-layout and re-draw
|
||||
ldd r16, Y+OBJECT_OFFS_FLAGS
|
||||
ori r16, (1<<WIDGET_FLAGS_DIRTY_BIT) | (1<<WIDGET_FLAGS_LAYOUT_BIT)
|
||||
std Y+OBJECT_OFFS_FLAGS, r16
|
||||
hLayoutSetX_next:
|
||||
rcall OBJ_GetNext
|
||||
brcs hLayoutSetX_loop
|
||||
hLayoutSetX_loopEnd:
|
||||
pop yh
|
||||
pop yl
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine hLayoutVerticalAdjust
|
||||
; @routine hLayoutVertically
|
||||
;
|
||||
; @param Y pointer to widget
|
||||
; @clobbers r17, r18, r19, r20, r21, r22, r23, Z
|
||||
; @clobbers any, !Y
|
||||
|
||||
hLayoutVerticalAdjust:
|
||||
hLayoutVertically:
|
||||
bigcall Layout_SetDefaultWidths ; (any, !Y)
|
||||
; calc usable height of host widget
|
||||
ldd r22, Y+WIDGET_OFFS_HEIGHT_LO
|
||||
ldd r23, Y+WIDGET_OFFS_HEIGHT_HI
|
||||
ldd zl, Y+WIDGET_OFFS_STYLE_LO
|
||||
ldd zh, Y+WIDGET_OFFS_STYLE_HI
|
||||
adiw zh:zl, WIDGET_STYLE_OFFS_OUTERBORDERSIZE
|
||||
lpm r18, Z+
|
||||
lpm r19, Z
|
||||
sub r22, r18
|
||||
sbc r23, r19
|
||||
sub r22, r18
|
||||
sbc r23, r19
|
||||
; r23:r22=width of host widget
|
||||
push yl
|
||||
push yh
|
||||
mov xl, yl
|
||||
mov xh, yh
|
||||
bigcall OBJ_GetFirstChild
|
||||
hLayoutVertically_loop:
|
||||
brcc hLayoutVertically_loopEnd
|
||||
mov yl, r18
|
||||
mov yh, r19
|
||||
|
||||
ldd r12, Y+WIDGET_OFFS_TMP_LO
|
||||
ldd r13, Y+WIDGET_OFFS_TMP_HI
|
||||
|
||||
ldd r17, Y+WIDGET_OFFS_PACK
|
||||
andi r17, (1<<WIDGET_PACK_VSELF1_BIT) | (1<<WIDGET_PACK_VSELF0_BIT)
|
||||
cpi r17, (WIDGET_PACK_FILLED<<WIDGET_PACK_VSELF0_BIT)
|
||||
brne hLayoutVertically_setHeight
|
||||
mov r12, r22
|
||||
mov r13, r23
|
||||
hLayoutVertically_setHeight:
|
||||
std Y+WIDGET_OFFS_HEIGHT_LO, r12
|
||||
std Y+WIDGET_OFFS_HEIGHT_HI, r13
|
||||
push yl
|
||||
push yh
|
||||
mov yl, xl
|
||||
mov yh, xh
|
||||
rcall Widget_PackSelfY ; R7:R6=new pos (r17, r18, r19, r20, r21)
|
||||
pop yh
|
||||
pop yl
|
||||
std Y+WIDGET_OFFS_Y_LO, r6
|
||||
std Y+WIDGET_OFFS_Y_HI, r7
|
||||
rcall OBJ_GetNext
|
||||
rjmp hLayoutVertically_loop
|
||||
hLayoutVertically_loopEnd:
|
||||
pop yh
|
||||
pop yl
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine hLayoutHorizontally
|
||||
;
|
||||
; @param Y pointer to widget
|
||||
; @clobbers any, !Y
|
||||
|
||||
hLayoutHorizontally:
|
||||
ldd r16, Y+HLAYOUT_OFFS_MODE
|
||||
cpi r16, HLAYOUT_MODE_SPREAD
|
||||
breq hLayoutHorizontally_spread
|
||||
rjmp hLayoutExpand
|
||||
hLayoutHorizontally_spread:
|
||||
rjmp hLayoutSpread
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine hLayoutExpand
|
||||
;
|
||||
; @param Y pointer to widget
|
||||
; @clobbers any, !Y
|
||||
|
||||
hLayoutExpand:
|
||||
rcall Layout_SetDefaultWidths
|
||||
rcall Layout_SumTmpValues ; r19:r18=width+borders
|
||||
|
||||
ldd r22, Y+WIDGET_OFFS_WIDTH_LO
|
||||
ldd r23, Y+WIDGET_OFFS_WIDTH_HI
|
||||
sub r22, r18
|
||||
sbc r23, r19 ; r23:r22=(height-usedSpace)=unusedSpace
|
||||
breq hLayoutExpand_setX
|
||||
brcs hLayoutExpand_setX
|
||||
|
||||
; r23:r22=remaining space to distribute
|
||||
push r22
|
||||
push r23
|
||||
ldi r22, (1<<WIDGET_PACK_HSELF1_BIT) | (1<<WIDGET_PACK_HSELF0_BIT) ; mask
|
||||
ldi r23, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) ; value
|
||||
rcall LayoutCountChildrenWithPackMode ; r16=number of expandable child widgets
|
||||
pop r23
|
||||
pop r22
|
||||
tst r16
|
||||
breq hLayoutExpand_setX
|
||||
|
||||
; calc space to add to each expandable child widget and add it
|
||||
mov r20, r22
|
||||
mov r21, r23
|
||||
mov r22, r16
|
||||
clr r23
|
||||
bigcall Utils_Divu16_16_16 ; r17:r16=space per expandable child widget
|
||||
mov r20, r16
|
||||
mov r21, r17
|
||||
|
||||
ldi r22, (1<<WIDGET_PACK_HSELF1_BIT) | (1<<WIDGET_PACK_HSELF0_BIT) ; mask
|
||||
ldi r23, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) ; value
|
||||
bigcall LayoutIncTmpOnMatchingPack
|
||||
|
||||
hLayoutExpand_setX:
|
||||
rcall hLayoutSetX
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine hLayoutExpand
|
||||
;
|
||||
; @param Y pointer to widget
|
||||
; @clobbers any, !Y
|
||||
|
||||
hLayoutSpread:
|
||||
rcall hLayoutPrepareSpread ; (any, !Y)
|
||||
rcall hLayoutFinalizeSpread ; (r18, r19, X)
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine hLayoutPrepareSpread
|
||||
;
|
||||
; @param Y pointer to widget
|
||||
; @return X startpos
|
||||
; @return r21:r20 extra space (in pixels)
|
||||
; @return r25:r24 spacing (including extra space)
|
||||
; @clobbers any, !Y
|
||||
|
||||
hLayoutPrepareSpread:
|
||||
rcall Layout_SetDefaultWidths ; (any, !Y)
|
||||
rcall Layout_SumTmpValues ; r21:r20=width+borders
|
||||
|
||||
ldd r18, Y+WIDGET_OFFS_WIDTH_LO
|
||||
ldd r19, Y+WIDGET_OFFS_WIDTH_HI
|
||||
sub r18, r20
|
||||
sbc r19, r21
|
||||
mov r20, r18
|
||||
mov r21, r19 ; remaining space
|
||||
|
||||
rcall LayoutCountVisibleChildren ; r16=number of visible child widgets (r17, r18, r19)
|
||||
inc r16
|
||||
mov r22, r16
|
||||
push r22
|
||||
ldi r22, (1<<WIDGET_PACK_HSELF1_BIT) | \
|
||||
(1<<WIDGET_PACK_HSELF0_BIT) ; mask
|
||||
ldi r23, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) ; value
|
||||
rcall LayoutCountChildrenWithPackMode ; r16=number of expandable children (r17, r18, r19)
|
||||
pop r22
|
||||
add r22, r16
|
||||
clr r23
|
||||
bigcall Utils_Divu16_16_16 ; r17:r16=space per element
|
||||
mov r20, r18
|
||||
mov r21, r19 ; r21:20=additional space per element
|
||||
|
||||
; get and adjust spacing, setup start pos
|
||||
ldd zl, Y+WIDGET_OFFS_STYLE_LO
|
||||
ldd zh, Y+WIDGET_OFFS_STYLE_HI
|
||||
adiw zh:zl, WIDGET_STYLE_OFFS_OUTERBORDERSIZE
|
||||
lpm xl, Z+ ; border
|
||||
clr xh
|
||||
lpm r24, Z ; spacing
|
||||
clr r25
|
||||
|
||||
add r24, r20 ; add extra space to spacing
|
||||
adc r25, r21
|
||||
|
||||
add xl, r20 ; add extra space to border
|
||||
adc xh, r21
|
||||
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; @routine hLayoutFinalizeSpread
|
||||
;
|
||||
; @param Y pointer to widget
|
||||
; @param X startpos
|
||||
; @param r21:r20 extra space (in pixels)
|
||||
; @param r25:r24 spacing (including extra space)
|
||||
; @clobbers r18, r19, X
|
||||
|
||||
hLayoutFinalizeSpread:
|
||||
push yl
|
||||
push yh
|
||||
bigcall OBJ_GetFirstChild
|
||||
brcc hLayoutFinalizeSpread_done
|
||||
hLayoutFinalizeSpread_loop:
|
||||
mov yl, r18
|
||||
mov yh, r19
|
||||
ldd r17, Y+OBJECT_OFFS_FLAGS
|
||||
sbrs r17, WIDGET_FLAGS_VISIBLE_BIT ; skip invisible widgets
|
||||
rjmp hLayoutFinalizeSpread_next
|
||||
; store pos
|
||||
std Y+WIDGET_OFFS_X_LO, xl
|
||||
std Y+WIDGET_OFFS_X_LO, xh
|
||||
; determine final height of child widget
|
||||
ldd r18, Y+WIDGET_OFFS_TMP_LO
|
||||
ldd r19, Y+WIDGET_OFFS_TMP_LO
|
||||
ldd r16, Y+WIDGET_OFFS_PACK
|
||||
andi r16, (1<<WIDGET_PACK_HSELF1_BIT) | (1<<WIDGET_PACK_HSELF0_BIT)
|
||||
cpi r16, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT)
|
||||
brne hLayoutFinalizeSpread_setWidth
|
||||
add r18, r20 ; add extra space
|
||||
adc r19, r21
|
||||
hLayoutFinalizeSpread_setWidth:
|
||||
std Y+WIDGET_OFFS_WIDTH_LO, r18
|
||||
std Y+WIDGET_OFFS_WIDTH_HI, r19
|
||||
; advance pos
|
||||
add xl, r18 ; add width to current pos
|
||||
adc xh, r19
|
||||
add xl, r24 ; add spacing to current pos
|
||||
adc xh, r25
|
||||
hLayoutFinalizeSpread_next:
|
||||
rcall OBJ_GetNext ; r19:r18=object (none)
|
||||
brcs hLayoutFinalizeSpread_loop
|
||||
hLayoutFinalizeSpread_done:
|
||||
pop yh
|
||||
pop yl
|
||||
ret
|
||||
; @end
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
; ***************************************************************************
|
||||
|
||||
Reference in New Issue
Block a user