suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix get-char-width' and get-char-height' in case font match fails

Browse Source
This commit is contained in:
Matthew Flatt 2011-05-04 11:00:55 -06:00
parent 4b03ddccb1
commit 5e7d1f2d9c
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
collects/racket/draw/private/dc.rkt
View File

@ -1745,18 +1745,22 @@
(g_object_unref layout))))))
(def/public (get-char-width)
(with-cr
10.0
cr
(get-font-metric cr pango_font_metrics_get_approximate_char_width)))
(or (with-cr
10.0
cr
(get-font-metric cr pango_font_metrics_get_approximate_char_width))
(let-values ([(w h d a) (get-text-extent "X")])
w)))
(def/public (get-char-height)
(with-cr
12.0
cr
(get-font-metric cr (lambda (m)
(+ (pango_font_metrics_get_ascent m)
(pango_font_metrics_get_descent m))))))
(or (with-cr
12.0
cr
(get-font-metric cr (lambda (m)
(+ (pango_font_metrics_get_ascent m)
(pango_font_metrics_get_descent m)))))
(let-values ([(w h d a) (get-text-extent "X")])
h)))
(define/private (get-font-metric cr sel)
(let ([desc (get-pango font)]
@ -1770,10 +1774,11 @@
(let ([font (pango_font_map_load_font (cdr context+fontmap)
(car context+fontmap)
desc)])
(let ([metrics (pango_font_get_metrics font (pango_language_get_default))])
(let ([v (sel metrics)])
(pango_font_metrics_unref metrics)
(/ v (exact->inexact PANGO_SCALE)))))))
(and font ;; else font match failed
(let ([metrics (pango_font_get_metrics font (pango_language_get_default))])
(let ([v (sel metrics)])
(pango_font_metrics_unref metrics)
(/ v (exact->inexact PANGO_SCALE))))))))
(void))