From 35fff61b1c0d736d090a1cd1bb4e99141cc88ad8 Mon Sep 17 00:00:00 2001 From: Damien Bargiacchi Date: Thu, 11 Aug 2016 15:57:03 -0700 Subject: Support use of custom fonts in miniui Bug: 29547343 Change-Id: I398160c85daac90ffab2fa9bb2e96795b9e9885a --- minui/minui.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'minui/minui.h') diff --git a/minui/minui.h b/minui/minui.h index fb0bbe10c..23156b6f1 100644 --- a/minui/minui.h +++ b/minui/minui.h @@ -33,6 +33,12 @@ struct GRSurface { unsigned char* data; }; +struct GRFont { + GRSurface* texture; + int char_width; + int char_height; +}; + int gr_init(); void gr_exit(); @@ -45,10 +51,14 @@ void gr_fb_blank(bool blank); void gr_clear(); // clear entire surface to current color void gr_color(unsigned char r, unsigned char g, unsigned char b, unsigned char a); void gr_fill(int x1, int y1, int x2, int y2); -void gr_text(int x, int y, const char *s, bool bold); + void gr_texticon(int x, int y, GRSurface* icon); -int gr_measure(const char *s); -void gr_font_size(int *x, int *y); + +const GRFont* gr_sys_font(); +int gr_init_font(const char* name, GRFont* dest); +void gr_text(const GRFont* font, int x, int y, const char *s, bool bold); +int gr_measure(const GRFont* font, const char *s); +void gr_font_size(const GRFont* font, int *x, int *y); void gr_blit(GRSurface* source, int sx, int sy, int w, int h, int dx, int dy); unsigned int gr_get_width(GRSurface* surface); -- cgit v1.2.3 From d00f5eb63a8e4690f9bef1e943d539d052444d9b Mon Sep 17 00:00:00 2001 From: Damien Bargiacchi Date: Fri, 9 Sep 2016 07:14:08 -0700 Subject: Have gr_init_font alloc memory for the font Change-Id: I8ccf369d52011bc5d07d8e041fe558ce734a78fc --- minui/minui.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'minui/minui.h') diff --git a/minui/minui.h b/minui/minui.h index 23156b6f1..d30426dc8 100644 --- a/minui/minui.h +++ b/minui/minui.h @@ -55,7 +55,7 @@ void gr_fill(int x1, int y1, int x2, int y2); void gr_texticon(int x, int y, GRSurface* icon); const GRFont* gr_sys_font(); -int gr_init_font(const char* name, GRFont* dest); +int gr_init_font(const char* name, GRFont** dest); void gr_text(const GRFont* font, int x, int y, const char *s, bool bold); int gr_measure(const GRFont* font, const char *s); void gr_font_size(const GRFont* font, int *x, int *y); -- cgit v1.2.3