From 27d2f4950f9eb658f7608be2b4c05eb7ebbf8d84 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 5 Aug 2017 22:32:13 +0200 Subject: [PATCH] Fix Clock Font on OSX (fixes Big Clock Window Size) Meanwhile libpango was fixed and we use CTFontManagerRegisterFontsForURL() on OSX >=10.6 --- gtk2_ardour/wscript | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index af61870a3d..78e217e2f7 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -733,21 +733,19 @@ def build(bld): 'HUGER' : '36', 'MASSIVE' : '60', } - - # There is no acceptable monospace font available on older versions of OS X - # and no API on those versions to load TTF files that will work with - # GTK/fontconfig/pango. - # - # In addition, the ArdourMono font gets clipped for some reason on OS X - # - # Moreover, Lucida Grande just seems to work even though it is not monospace - # so just use it. - # - font_names = { - 'MONOSPACE' : 'Monaco', - 'CLOCKFONT' : 'Lucida Grande', - } - else: # Linux/X11 fonts + if conf.env['build_target'] in ['panther', 'tiger', 'leopard'] or (Options.options.ppc and conf.env['build_target'] == 'snowleopard'): + # CTFontManagerRegisterFontsForURL for ArdourMono is 10.6 or newer + # "Lucida Grande" is not mono-spaced, but works for most cases, except big-clock-window + font_names = { + 'MONOSPACE' : 'Monaco', + 'CLOCKFONT' : 'Lucida Grande', + } + else: + font_names = { + 'MONOSPACE' : 'Monaco', + 'CLOCKFONT' : 'ArdourMono', + } + else: # Linux/X11 & Windows fonts basefont = '' # unspecified - use system defaults font_sizes = { 'SMALLER' : '6',