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

M: track pref-dim did not take the gap into account

db4
Slava Pestov 2008-11-19 17:47:25 -06:00
parent 6e9b2a6c73
commit b9e1f5bf8a
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
basis/ui/gadgets/tracks/tracks.factor
View File

@ -1,8 +1,8 @@
! Copyright (C) 2006, 2008 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: accessors io kernel math namespaces
sequences words math.vectors ui.gadgets ui.gadgets.packs
math.geometry.rect fry ;
USING: accessors io kernel namespaces fry
math math.vectors math.geometry.rect math.order
sequences words ui.gadgets ui.gadgets.packs ;
IN: ui.gadgets.tracks
@ -35,13 +35,16 @@ TUPLE: track < pack sizes ;
M: track layout* ( track -- ) dup track-layout pack-layout ;
: track-pref-dims-1 ( track -- dim ) children>> pref-dims max-dim ;
: track-pref-dims-1 ( track -- dim )
children>> pref-dims max-dim ;
: track-pref-dims-2 ( track -- dim )
[ children>> pref-dims ] [ normalized-sizes ] bi
[ [ v/n ] when* ] 2map
max-dim
[ >fixnum ] map ;
[
[ children>> pref-dims ] [ normalized-sizes ] bi
[ [ v/n ] when* ] 2map max-dim [ >fixnum ] map
]
[ [ gap>> ] [ children>> length 1 [-] ] bi v*n ] bi
v+ ;
M: track pref-dim* ( gadget -- dim )
[ track-pref-dims-1 ]