From 1e4ff2b04c45f05db62607e5446d19cdf515091f Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Fri, 13 Jul 2012 15:35:42 -0700 Subject: [PATCH] ui.text: cleanup string-width/height and make text-dim a bit faster. --- basis/ui/text/text.factor | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/basis/ui/text/text.factor b/basis/ui/text/text.factor index 1c8d5fa753..43ad9a9312 100644 --- a/basis/ui/text/text.factor +++ b/basis/ui/text/text.factor @@ -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>