vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

freetype,gg: option to pass a custom font_path to freetype.new_context .

pull/1552/head
Delyan Angelov 2019-08-09 17:48:19 +03:00 committed by Alexander Medvednikov
parent 6f03ed0b13
commit 7d8b296943
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vlib/freetype/freetype.v
View File

@ -152,17 +152,20 @@ pub fn new_context(cfg gg.Cfg, scale int) *Context {
println('ERROR::FREETYPE: Could not init FreeType Library') println('ERROR::FREETYPE: Could not init FreeType Library')
// Load font as face // Load font as face
// face := FT_Face{} // face := FT_Face{}
mut font_path := 'RobotoMono-Regular.ttf' mut font_path := cfg.font_path
if font_path == '' {
font_path = 'RobotoMono-Regular.ttf'
}
if !os.file_exists(font_path) { if !os.file_exists(font_path) {
exe_path := os.executable() exe_path := os.executable()
exe_dir := os.basedir(exe_path) exe_dir := os.basedir(exe_path)
println('Trying to load from $exe_dir') font_path = '$exe_dir/$font_path'
font_path = '$exe_dir/RobotoMono-Regular.ttf'
} }
if !os.file_exists(font_path) { if !os.file_exists(font_path) {
println('failed to load RobotoMono-Regular.ttf') println('failed to load $font_path')
return 0 return 0
} }
println('Trying to load font from $font_path')
# FT_Face face; # FT_Face face;
# if (FT_New_Face(ft, font_path.str, 0, &face)) # if (FT_New_Face(ft, font_path.str, 0, &face))
// # if (FT_New_Face(ft, "/Library/Fonts/Courier New.ttf", 0, &face)) // # if (FT_New_Face(ft, "/Library/Fonts/Courier New.ttf", 0, &face))

1
vlib/gg/gg.v
View File

@ -48,6 +48,7 @@ pub:
retina bool retina bool
font_size int font_size int
font_path string
create_window bool create_window bool
window_user_ptr voidptr window_user_ptr voidptr
window_title string window_title string