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

ui.gadgets.tables: center cells vertically, add padding around images

db4
Slava Pestov 2009-04-11 14:14:32 -05:00
parent ad2b7b74f4
commit c626004735
1 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
basis/ui/gadgets/tables/tables.factor
View File

@ -59,14 +59,19 @@ focused? ;
GENERIC: cell-width ( font cell -- x ) GENERIC: cell-width ( font cell -- x )
GENERIC: cell-height ( font cell -- y ) GENERIC: cell-height ( font cell -- y )
GENERIC: cell-padding ( cell -- y )
GENERIC: draw-cell ( font cell -- ) GENERIC: draw-cell ( font cell -- )
M: string cell-width text-width ; M: string cell-width text-width ;
M: string cell-height text-height ceiling ; M: string cell-height text-height ceiling ;
M: string cell-padding drop 0 ;
M: string draw-cell draw-text ; M: string draw-cell draw-text ;
CONSTANT: image-padding 2
M: image-name cell-width nip image-dim first ; M: image-name cell-width nip image-dim first ;
M: image-name cell-height nip image-dim second ; M: image-name cell-height nip image-dim second ;
M: image-name cell-padding drop image-padding ;
M: image-name draw-cell nip draw-image ; M: image-name draw-cell nip draw-image ;
: table-rows ( table -- rows ) : table-rows ( table -- rows )
@ -87,7 +92,7 @@ CONSTANT: column-title-background COLOR: light-gray
if ; if ;
: row-column-widths ( table row -- widths ) : row-column-widths ( table row -- widths )
[ font>> ] dip [ cell-width ] with map ; [ font>> ] dip [ [ cell-width ] [ cell-padding ] bi + ] with map ;
: compute-total-width ( gap widths -- total ) : compute-total-width ( gap widths -- total )
swap [ column-offsets drop ] keep - ; swap [ column-offsets drop ] keep - ;
@ -162,9 +167,10 @@ M: table layout*
'[ [ 0 2array ] [ _ 2array ] bi gl-line ] each '[ [ 0 2array ] [ _ 2array ] bi gl-line ] each
] bi ; ] bi ;
: column-loc ( font column width align -- loc ) :: column-loc ( font column width align -- loc )
[ [ cell-width ] dip swap - ] dip font column cell-width width swap - align * column cell-padding 2 / 1 align - * +
* >integer 0 2array ; font column cell-height \ line-height get swap - 2 /
[ >integer ] bi@ 2array ;
: translate-column ( width gap -- ) : translate-column ( width gap -- )
+ 0 2array gl-translate ; + 0 2array gl-translate ;
@ -203,18 +209,21 @@ M: table draw-line ( row index table -- )
M: table draw-gadget* M: table draw-gadget*
dup control-value empty? [ drop ] [ dup control-value empty? [ drop ] [
{ dup line-height \ line-height [
[ draw-selected-row ] {
[ draw-lines ] [ draw-selected-row ]
[ draw-column-lines ] [ draw-lines ]
[ draw-focused-row ] [ draw-column-lines ]
[ draw-moused-row ] [ draw-focused-row ]
} cleave [ draw-moused-row ]
} cleave
] with-variable
] if ; ] if ;
M: table line-height ( table -- y ) M: table line-height ( table -- y )
[ font>> ] [ renderer>> prototype-row ] bi [ font>> ] [ renderer>> prototype-row ] bi
[ cell-height ] with [ max ] map-reduce ; [ [ cell-height ] [ cell-padding ] bi + ] with
[ max ] map-reduce ;
M: table pref-dim* M: table pref-dim*
[ compute-column-widths drop ] keep [ compute-column-widths drop ] keep
@ -379,14 +388,16 @@ TUPLE: column-headers < gadget table ;
column-title-background <solid> >>interior ; column-title-background <solid> >>interior ;
: draw-column-titles ( table -- ) : draw-column-titles ( table -- )
{ dup font>> font-metrics height>> \ line-height [
[ renderer>> column-titles ] {
[ column-widths>> ] [ renderer>> column-titles ]
[ table-column-alignment ] [ column-widths>> ]
[ font>> column-title-font ] [ table-column-alignment ]
[ gap>> ] [ font>> column-title-font ]
} cleave [ gap>> ]
draw-columns ; } cleave
draw-columns
] with-variable ;
M: column-headers draw-gadget* M: column-headers draw-gadget*
table>> draw-column-titles ; table>> draw-column-titles ;