From 0b5c1b79c17143ec2ef46eea8fd77921e8e78a84 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 23 Mar 2013 16:41:02 -0700 Subject: [PATCH] ui.gadgets: Rename grid-layout. --- basis/ui/gadgets/grids/grids.factor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/basis/ui/gadgets/grids/grids.factor b/basis/ui/gadgets/grids/grids.factor index d103ce401c..d9812b5a11 100644 --- a/basis/ui/gadgets/grids/grids.factor +++ b/basis/ui/gadgets/grids/grids.factor @@ -44,7 +44,7 @@ M: cell baseline baseline>> ; M: cell cap-height cap-height>> ; -TUPLE: grid-layout grid gap fill? row-heights column-widths ; +TUPLE: grid-layout-tuple 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 grid gap fill? row-heights column-widths ; grid>> flip [ first ] iterate-cell-dims ; : ( grid -- grid-layout ) - \ grid-layout new + \ grid-layout-tuple new swap [ grid>> [ [ ] map ] map >>grid ] [ fill?>> >>fill? ]