steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change remove-gadget semantics so that removing glass from world doesn't break

db4
Slava Pestov 2009-02-18 19:25:34 -06:00
parent 773d292688
commit f6f9b0874e
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
basis/ui/gadgets/gadgets.factor
View File

@ -295,16 +295,22 @@ PRIVATE>
GENERIC: remove-gadget ( gadget parent -- ) GENERIC: remove-gadget ( gadget parent -- )
M: gadget remove-gadget M: gadget remove-gadget 2drop ;
over (unparent)
[ unfocus-gadget ]
[ children>> delete ]
[ nip relayout ]
2tri ;
: unparent ( gadget -- ) : unparent ( gadget -- )
not-in-layout not-in-layout
[ dup parent>> dup [ remove-gadget ] [ 2drop ] if ] when* ; [
dup parent>> dup
[
[ remove-gadget ] [
over (unparent)
[ unfocus-gadget ]
[ children>> delete ]
[ nip relayout ]
2tri
] 2bi
] [ 2drop ] if
] when* ;
: clear-gadget ( gadget -- ) : clear-gadget ( gadget -- )
not-in-layout not-in-layout

8
basis/ui/gadgets/worlds/worlds-tests.factor
View File

@ -48,14 +48,12 @@ IN: ui.gadgets.worlds.tests
TUPLE: focusing < gadget ; TUPLE: focusing < gadget ;
: <focusing> : <focusing> ( -- gadget ) focusing new ;
focusing new ;
TUPLE: focus-test < gadget ; TUPLE: focus-test < gadget ;
: <focus-test> : <focus-test> ( -- gadget )
focus-test new focus-test new <focusing> add-gadget ;
dup <focusing> add-gadget drop ;
M: focus-test focusable-child* gadget-child ; M: focus-test focusable-child* gadget-child ;

3
basis/ui/gadgets/worlds/worlds.factor
View File

@ -61,6 +61,9 @@ M: world focusable-child* gadget-child ;
M: world children-on nip children>> ; M: world children-on nip children>> ;
M: world remove-gadget
2dup glass>> eq? [ 2drop ] [ call-next-method ] if ;
: (draw-world) ( world -- ) : (draw-world) ( world -- )
dup handle>> [ dup handle>> [
{ {