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

Simplify core-text vocab a bit since we don't need the CTFont after we've created the CTLine anymore

db4
Slava Pestov 2009-02-28 20:33:27 -06:00
parent fe1d6a0e13
commit a1cffb65cd
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
basis/core-text/core-text.factor
View File

@ -46,7 +46,7 @@ ERROR: not-a-string object ;
CTLineCreateWithAttributedString CTLineCreateWithAttributedString
] with-destructors ; ] with-destructors ;
TUPLE: line font line metrics image loc dim disposed ; TUPLE: line line metrics image loc dim disposed ;
: typographic-bounds ( line -- width ascent descent leading ) : typographic-bounds ( line -- width ascent descent leading )
0 <CGFloat> 0 <CGFloat> 0 <CGFloat> 0 <CGFloat> 0 <CGFloat> 0 <CGFloat>
@ -86,11 +86,14 @@ TUPLE: line font line metrics image loc dim disposed ;
[ f CTLineGetOffsetForStringIndex round ] bi-curry@ bi [ f CTLineGetOffsetForStringIndex round ] bi-curry@ bi
[ drop nip 0 ] [ swap - swap second ] 3bi <CGRect> ; [ drop nip 0 ] [ swap - swap second ] 3bi <CGRect> ;
: CGRect-translate-x ( CGRect x -- CGRect' )
[ dup CGRect-x ] dip - over set-CGRect-x ;
:: fill-selection-background ( context loc dim line string -- ) :: fill-selection-background ( context loc dim line string -- )
string selection? [ string selection? [
context string color>> >rgba-components CGContextSetRGBFillColor context string color>> >rgba-components CGContextSetRGBFillColor
context dim line string selection-rect context dim line string selection-rect
dup CGRect-x loc first - over set-CGRect-x loc first CGRect-translate-x
CGContextFillRect CGContextFillRect
] when ; ] when ;
@ -106,7 +109,7 @@ TUPLE: line font line metrics image loc dim disposed ;
:: <line> ( font string -- line ) :: <line> ( font string -- line )
[ [
[let* | open-font [ font cache-font CFRetain |CFRelease ] [let* | open-font [ font cache-font ]
line [ string open-font font foreground>> <CTLine> |CFRelease ] line [ string open-font font foreground>> <CTLine> |CFRelease ]
rect [ line line-rect ] rect [ line line-rect ]
@ -117,7 +120,7 @@ TUPLE: line font line metrics image loc dim disposed ;
ext [ (loc) (dim) [ + ceiling ] 2map ] ext [ (loc) (dim) [ + ceiling ] 2map ]
dim [ ext loc [ - >integer ] 2map ] dim [ ext loc [ - >integer ] 2map ]
metrics [ open-font line compute-line-metrics ] | metrics [ open-font line compute-line-metrics ] |
open-font line metrics line metrics
dim [ dim [
{ {
[ font dim fill-background ] [ font dim fill-background ]
@ -132,7 +135,7 @@ TUPLE: line font line metrics image loc dim disposed ;
f line boa f line boa
] with-destructors ; ] with-destructors ;
M: line dispose* [ font>> CFRelease ] [ line>> CFRelease ] bi ; M: line dispose* line>> CFRelease ;
SYMBOL: cached-lines SYMBOL: cached-lines