From 197a505e4caba0cbeb4e73fcd960ca1923b19e35 Mon Sep 17 00:00:00 2001 From: natinusala Date: Sat, 16 May 2015 16:38:13 +0200 Subject: [PATCH] Adding gl_get_message_width to gl_raster_font --- gfx/drivers_font/gl_raster_font.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c index e90fc5d608..edbdaf4e1e 100644 --- a/gfx/drivers_font/gl_raster_font.c +++ b/gfx/drivers_font/gl_raster_font.c @@ -126,8 +126,12 @@ static void gl_raster_font_free_font(void *data) free(font); } -static int get_message_width(gl_raster_t *font, const char *msg, float scale) +static int gl_get_message_width(void *data, const char *msg, float scale) { + gl_raster_t *font = (gl_raster_t*)data; + if (!font) + return 0; + unsigned i; unsigned msg_len_full = strlen(msg); unsigned msg_len = min(msg_len_full, MAX_MSG_LEN_CHUNK); @@ -194,10 +198,10 @@ static void gl_raster_font_render_message( switch (text_align) { case TEXT_ALIGN_RIGHT: - x -= get_message_width(font, msg, scale); + x -= gl_get_message_width(font, msg, scale); break; case TEXT_ALIGN_CENTER: - x -= get_message_width(font, msg, scale) / 2.0; + x -= gl_get_message_width(font, msg, scale) / 2.0; break; } @@ -408,5 +412,5 @@ font_renderer_t gl_raster_font = { gl_raster_font_get_glyph, gl_raster_font_bind_block, gl_raster_font_flush_block, - NULL /* get_message_width */ + gl_get_message_width };