ui.text: cleanup string-width/height and make text-dim a bit faster.

db4
John Benediktsson 2012-07-13 15:35:42 -07:00
parent 8350b54bbc
commit c1e9f4c362
1 changed files with 3 additions and 11 deletions

View File

@ -19,22 +19,14 @@ HOOK: flush-layout-cache font-renderer ( -- )
HOOK: string-dim font-renderer ( font string -- dim )
HOOK: string-width font-renderer ( font string -- w )
: string-width ( font string -- w ) string-dim first ; inline
HOOK: string-height font-renderer ( font string -- h )
M: object string-dim [ string-width ] [ string-height ] 2bi 2array ;
M: object string-width string-dim first ;
M: object string-height string-dim second ;
: string-height ( font string -- h ) string-dim second ; inline
HOOK: free-fonts font-renderer ( world -- )
: combine-text-dim ( dim1 dim2 -- dim3 )
[ [ first ] bi@ max ]
[ [ second ] bi@ + ]
2bi 2array ;
[ first2 ] bi@ swapd [ max ] [ + ] 2bi* 2array ; inline
PRIVATE>