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

ui.gadgets.packs: change pack-layout not to round.

master
John Benediktsson 2020-05-16 11:10:18 -07:00
parent 7b023ad59d
commit 68f6eeb3ad
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
basis/ui/gadgets/packs/packs.factor
View File

@ -25,7 +25,7 @@ TUPLE: pack < aligned-gadget
[ { 0 0 } ] dip '[ v+ _ v+ ] accumulate nip ; [ { 0 0 } ] dip '[ v+ _ v+ ] accumulate nip ;
: numerically-aligned-locs ( sizes pack -- seq ) : numerically-aligned-locs ( sizes pack -- seq )
[ align>> ] [ dim>> ] bi '[ [ _ _ ] dip v- [ * >integer ] with map ] map ; [ align>> ] [ dim>> ] bi rot [ v- [ * ] with map ] 2with map ;
: baseline-aligned-locs ( pack -- seq ) : baseline-aligned-locs ( pack -- seq )
children>> align-baselines [ 0 swap 2array ] map ; children>> align-baselines [ 0 swap 2array ] map ;
@ -39,15 +39,10 @@ TUPLE: pack < aligned-gadget
: packed-locs ( sizes pack -- seq ) : packed-locs ( sizes pack -- seq )
[ aligned-locs ] [ gap>> gap-locs ] [ nip ] 2tri orient ; [ aligned-locs ] [ gap>> gap-locs ] [ nip ] 2tri orient ;
: round-dims ( seq -- newseq )
[ { 0 0 } ] dip
[ swap v- dup vceiling [ swap v- ] keep ] map
nip ;
PRIVATE> PRIVATE>
: pack-layout ( pack sizes -- ) : pack-layout ( pack sizes -- )
[ round-dims packed-dims ] [ drop ] 2bi [ packed-dims ] [ drop ] 2bi
[ children>> [ dim<< ] 2each ] [ children>> [ dim<< ] 2each ]
[ [ packed-locs ] [ children>> ] bi [ loc<< ] 2each ] 2bi ; [ [ packed-locs ] [ children>> ] bi [ loc<< ] 2each ] 2bi ;