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

ui.gadgets.grids: rename grid-layout-tuple to grid-layout.

db4
John Benediktsson 2015-07-27 08:40:30 -07:00
parent ca0f80f230
commit 332e3ad52f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/ui/gadgets/frames/frames.factor
View File

@ -39,7 +39,7 @@ M: glue pref-dim* drop { 0 0 } ;
PRIVATE>
M: frame layout*
[ grid>> ] [ <frame-layout> ] bi grid-layout ;
[ grid>> ] [ <frame-layout> ] bi layout-grid ;
: new-frame ( cols rows class -- frame )
[ <frame-grid> ] dip new-grid ; inline

8
basis/ui/gadgets/grids/grids.factor
View File

@ -44,7 +44,7 @@ M: grid-cell baseline baseline>> ;
M: grid-cell cap-height cap-height>> ;
TUPLE: grid-layout-tuple grid gap fill? row-heights column-widths ;
TUPLE: grid-layout grid gap fill? row-heights column-widths ;
: iterate-cell-dims ( cells quot -- seq )
'[ [ pref-dim>> @ ] [ max ] map-reduce ] map ; inline
@ -59,7 +59,7 @@ TUPLE: grid-layout-tuple grid gap fill? row-heights column-widths ;
grid>> flip [ first ] iterate-cell-dims ;
: <grid-layout> ( grid -- grid-layout )
\ grid-layout-tuple new
grid-layout new
swap
[ grid>> [ [ <grid-cell> ] map ] map >>grid ]
[ fill?>> >>fill? ]
@ -107,11 +107,11 @@ M: grid pref-dim* <grid-layout> grid-pref-dim ;
[ grid>> [ [ pref-dim>> ] map ] map ]
if ;
: grid-layout ( children grid-layout -- )
: layout-grid ( children grid-layout -- )
[ cell-locs ] [ cell-dims ] bi
[ [ <rect> swap set-rect-bounds ] 3each ] 3each ;
M: grid layout* [ grid>> ] [ <grid-layout> ] bi grid-layout ;
M: grid layout* [ grid>> ] [ <grid-layout> ] bi layout-grid ;
M: grid children-on ( rect gadget -- seq )
dup children>> empty? [ 2drop f ] [