From d4441e43531f24270db831b7ed58d96f803af6b3 Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Fri, 9 Aug 2019 17:57:48 +0200 Subject: [PATCH] freetype: clean up new_context() --- examples/tetris/tetris.v | 3 ++- vlib/freetype/freetype.v | 7 +++++-- vlib/gg/gg.v | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/examples/tetris/tetris.v b/examples/tetris/tetris.v index 901922bc67..fd8826fb11 100644 --- a/examples/tetris/tetris.v +++ b/examples/tetris/tetris.v @@ -140,7 +140,8 @@ fn main() { height: WinHeight use_ortho: true font_size: 18 - }, 1) + scale: 2 + }) game.font_loaded = (game.ft != 0 ) for { gg.clear(gx.White) diff --git a/vlib/freetype/freetype.v b/vlib/freetype/freetype.v index 4836b9eea1..d21ad94486 100644 --- a/vlib/freetype/freetype.v +++ b/vlib/freetype/freetype.v @@ -63,18 +63,20 @@ struct Context { scale int // retina = 2 , normal = 1 } +/* struct Cfg { width int height int use_ortho bool retina bool - + scale int font_size int create_window bool window_user_ptr voidptr window_title string always_on_top bool } +*/ // jfn ft_load_char(face FT_Face, code FT_ULong) Character { @@ -116,7 +118,8 @@ fn ft_load_char(_face Face, code i64) Character { return ch } -pub fn new_context(cfg gg.Cfg, scale int) *Context { +pub fn new_context(cfg gg.Cfg) *Context { + scale := cfg.scale // Can only have text in ortho mode if !cfg.use_ortho { return &Context{} diff --git a/vlib/gg/gg.v b/vlib/gg/gg.v index 2359e55a46..d871fd6002 100644 --- a/vlib/gg/gg.v +++ b/vlib/gg/gg.v @@ -53,6 +53,7 @@ pub: window_user_ptr voidptr window_title string always_on_top bool + scale int } struct GG {