Merge branch 'master' of git://factorcode.org/git/factor

db4
Doug Coleman 2008-09-01 18:27:13 -05:00
commit 08ba3e6f37
2 changed files with 4 additions and 4 deletions

View File

@ -60,10 +60,10 @@ M: gadget draw-selection ( loc gadget -- )
swap offset-rect [ rect-extent gl-fill-rect ] if-fits ; swap offset-rect [ rect-extent gl-fill-rect ] if-fits ;
M: node draw-selection ( loc node -- ) M: node draw-selection ( loc node -- )
2dup node-value swap offset-rect [ 2dup value>> swap offset-rect [
drop 2dup drop 2dup
[ node-value rect-loc v+ ] keep [ value>> rect-loc v+ ] keep
node-children [ draw-selection ] with each children>> [ draw-selection ] with each
] if-fits 2drop ; ] if-fits 2drop ;
M: pane draw-gadget* M: pane draw-gadget*

View File

@ -77,7 +77,7 @@ DEFER: (gadget-subtree)
[ (gadget-subtree) ] { } make ; [ (gadget-subtree) ] { } make ;
M: node gadget-text* M: node gadget-text*
dup node-children swap node-value gadget-seq-text ; dup children>> swap value>> gadget-seq-text ;
: gadget-text-range ( frompath topath gadget -- str ) : gadget-text-range ( frompath topath gadget -- str )
gadget-subtree gadget-text ; gadget-subtree gadget-text ;