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

Fix a bug

slava 2006-12-11 01:08:09 +00:00
parent b01b92c8b1
commit 3a61746b93
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/ui/gadgets.factor
View File

@ -38,13 +38,6 @@ M: array rect-dim drop { 0 0 } ;
: intersects? ( rect/point rect -- ? ) : intersects? ( rect/point rect -- ? )
(rect-intersect) [v-] { 0 0 } = ; (rect-intersect) [v-] { 0 0 } = ;
! gadget-pref-dim is a cached value; call pref-dim instead
! gadget-children is a vector
! gadget-orientation is { 1 0 } or { 0 1 }
! gadget-state is f, relayout or relayout-1
! gadget-root? relayout requests do not propogate higher
! gadget-grafted? are we part of a live world's gadget hierarchy
! gadget-interior, gadget-boundary: see paint.factor
TUPLE: gadget TUPLE: gadget
pref-dim parent children orientation state pref-dim parent children orientation state
visible? root? clipped? grafted? visible? root? clipped? grafted?
@ -89,7 +82,7 @@ M: gadget children-on nip gadget-children ;
: (pick-up) ( point gadget -- gadget/f ) : (pick-up) ( point gadget -- gadget/f )
dupd children-on <reversed> [ inside? ] find-with nip ; dupd children-on <reversed> [ inside? ] find-with nip ;
: translate ( point -- ) origin [ v+ ] change ; : translate ( rect/point -- ) rect-loc origin [ v+ ] change ;
: pick-up ( point gadget -- child/f ) : pick-up ( point gadget -- child/f )
[ [

2
core/ui/paint.factor
View File

@ -37,7 +37,7 @@ DEFER: draw-gadget
: (draw-gadget) ( gadget -- ) : (draw-gadget) ( gadget -- )
[ [
dup rect-loc translate dup translate
dup dup gadget-interior draw-interior dup dup gadget-interior draw-interior
dup draw-gadget* dup draw-gadget*
dup visible-children [ draw-gadget ] each dup visible-children [ draw-gadget ] each