From dbce01792c2bd33ed20583bf231ee4ddd98b3bfa Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Thu, 24 Sep 2020 17:09:03 +0300 Subject: [PATCH] gg: try 3 different fonts in system_font_path on MacOS --- vlib/gg/text_rendering.v | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vlib/gg/text_rendering.v b/vlib/gg/text_rendering.v index f7fbb283da..7d04e0502f 100644 --- a/vlib/gg/text_rendering.v +++ b/vlib/gg/text_rendering.v @@ -179,8 +179,12 @@ pub fn system_font_path() string { mut fonts := ['Ubuntu-R.ttf', 'Arial.ttf', 'LiberationSans-Regular.ttf', 'NotoSans-Regular.ttf', 'FreeSans.ttf', 'DejaVuSans.ttf'] $if macos { - return '/System/Library/Fonts/SFNS.ttf' - //fonts = ['SFNS.ttf', 'SFNSText.ttf'] + fonts = ['/System/Library/Fonts/SFNS.ttf', '/System/Library/Fonts/SFNSText.ttf', '/Library/Fonts/Arial.ttf'] + for font in fonts { + if os.is_file(font) { + return font + } + } } s := os.exec('fc-list') or { panic('failed to fetch system fonts') } system_fonts := s.output.split('\n')