ui.gadgets.tracks: rewrite alloted-dim
parent
43b2022176
commit
27c83d4884
|
@ -11,16 +11,16 @@ TUPLE: track < pack sizes ;
|
||||||
[ sift sum ] keep [ dup [ over / ] when ] map nip ;
|
[ sift sum ] keep [ dup [ over / ] when ] map nip ;
|
||||||
|
|
||||||
: new-track ( orientation class -- track )
|
: new-track ( orientation class -- track )
|
||||||
new-gadget
|
new-gadget
|
||||||
swap >>orientation
|
swap >>orientation
|
||||||
V{ } clone >>sizes
|
V{ } clone >>sizes
|
||||||
1 >>fill ; inline
|
1 >>fill ; inline
|
||||||
|
|
||||||
: <track> ( orientation -- track ) track new-track ;
|
: <track> ( orientation -- track ) track new-track ;
|
||||||
|
|
||||||
: alloted-dim ( track -- dim )
|
: alloted-dim ( track -- dim )
|
||||||
dup gadget-children swap track-sizes { 0 0 }
|
[ children>> ] [ sizes>> ] bi { 0 0 }
|
||||||
[ [ drop { 0 0 } ] [ pref-dim ] if v+ ] 2reduce ;
|
[ [ drop { 0 0 } ] [ pref-dim ] if v+ ] 2reduce ;
|
||||||
|
|
||||||
: available-dim ( track -- dim ) [ dim>> ] [ alloted-dim ] bi v- ;
|
: available-dim ( track -- dim ) [ dim>> ] [ alloted-dim ] bi v- ;
|
||||||
|
|
||||||
|
@ -47,8 +47,7 @@ M: track pref-dim* ( gadget -- dim )
|
||||||
over track-sizes push swap add-gadget drop ;
|
over track-sizes push swap add-gadget drop ;
|
||||||
|
|
||||||
: track-add* ( track gadget constraint -- track )
|
: track-add* ( track gadget constraint -- track )
|
||||||
pick sizes>> push
|
pick sizes>> push add-gadget ;
|
||||||
add-gadget ;
|
|
||||||
|
|
||||||
: track-remove ( gadget track -- )
|
: track-remove ( gadget track -- )
|
||||||
over [
|
over [
|
||||||
|
|
Loading…
Reference in New Issue