diff --git a/gfx/drivers_font/gdi_font.c b/gfx/drivers_font/gdi_font.c index 7483107901..ab5cc36e9f 100644 --- a/gfx/drivers_font/gdi_font.c +++ b/gfx/drivers_font/gdi_font.c @@ -32,6 +32,7 @@ #include "../common/win32_common.h" #include "../font_driver.h" +#include "../../configuration.h" #include "../../verbosity.h" @@ -97,8 +98,14 @@ static void gdi_render_msg( gdi_raster_t *font = (gdi_raster_t*)data; unsigned width = video_info->width; unsigned height = video_info->height; - SIZE textSize = {0}; - struct string_list *msg_list = NULL; + SIZE textSize = {0}; + struct string_list *msg_list = NULL; + settings_t *settings = config_get_ptr(); + float video_msg_pos_x = settings->floats.video_msg_pos_x; + float video_msg_pos_y = settings->floats.video_msg_pos_y; + float video_msg_color_r = settings->floats.video_msg_color_r; + float video_msg_color_g = settings->floats.video_msg_color_g; + float video_msg_color_b = settings->floats.video_msg_color_b; if (!font || string_is_empty(msg) || !font->gdi) return; @@ -120,17 +127,17 @@ static void gdi_render_msg( } else { - x = video_info->font_msg_pos_x; - y = video_info->font_msg_pos_y; + x = video_msg_pos_x; + y = video_msg_pos_y; drop_x = -2; drop_y = -2; drop_mod = 0.3f; drop_alpha = 1.0f; scale = 1.0f; align = TEXT_ALIGN_LEFT; - red = video_info->font_msg_color_r * 255.0f; - green = video_info->font_msg_color_g * 255.0f; - blue = video_info->font_msg_color_b * 255.0f; + red = video_msg_color_r * 255.0f; + green = video_msg_color_g * 255.0f; + blue = video_msg_color_b * 255.0f; } msg_strlen = strlen(msg); @@ -140,19 +147,19 @@ static void gdi_render_msg( switch (align) { case TEXT_ALIGN_LEFT: - newX = x * width * scale; + newX = x * width * scale; newDropX = drop_x * width * scale; break; case TEXT_ALIGN_RIGHT: - newX = (x * width * scale) - textSize.cx; + newX = (x * width * scale) - textSize.cx; newDropX = (drop_x * width * scale) - textSize.cx; break; case TEXT_ALIGN_CENTER: - newX = (x * width * scale) - (textSize.cx / 2); + newX = (x * width * scale) - (textSize.cx / 2); newDropX = (drop_x * width * scale) - (textSize.cx / 2); break; default: - newX = 0; + newX = 0; newDropX = 0; break; } diff --git a/gfx/drivers_font/sixel_font.c b/gfx/drivers_font/sixel_font.c index 4211cb618e..03f2b30e4e 100644 --- a/gfx/drivers_font/sixel_font.c +++ b/gfx/drivers_font/sixel_font.c @@ -24,6 +24,7 @@ #endif #include "../font_driver.h" +#include "../../configuration.h" #include "../../verbosity.h" #include "../common/sixel_common.h" @@ -83,25 +84,25 @@ static void sixel_render_msg(video_frame_info_t *video_info, unsigned newX, newY; unsigned align; sixel_raster_t *font = (sixel_raster_t*)data; - const struct font_params *params = (const struct font_params*)userdata; - - (void)newX; - (void)newY; + const struct font_params *params = (const struct font_params*)userdata; + settings_t *settings = config_get_ptr(); + float video_msg_pos_x = settings->floats.video_msg_pos_x; + float video_msg_pos_y = settings->floats.video_msg_pos_y; if (!font || string_is_empty(msg)) return; if (params) { - x = params->x; - y = params->y; + x = params->x; + y = params->y; scale = params->scale; align = params->text_align; } else { - x = video_info->font_msg_pos_x; - y = video_info->font_msg_pos_y; + x = video_msg_pos_x; + y = video_msg_pos_y; scale = 1.0f; align = TEXT_ALIGN_LEFT; } diff --git a/gfx/drivers_font/vga_font.c b/gfx/drivers_font/vga_font.c index e3128d963b..48832f1f8f 100644 --- a/gfx/drivers_font/vga_font.c +++ b/gfx/drivers_font/vga_font.c @@ -23,6 +23,7 @@ #endif #include "../font_driver.h" +#include "../../configuration.h" #include "../../verbosity.h" #include "../common/vga_common.h" @@ -84,6 +85,9 @@ static void vga_render_msg(video_frame_info_t *video_info, unsigned newX, newY; unsigned align; vga_raster_t *font = (vga_raster_t*)data; + settings_t *settings = config_get_ptr(); + float video_msg_pos_x = settings->floats.video_msg_pos_x; + float video_msg_pos_y = settings->floats.video_msg_pos_y; if (!font || string_is_empty(msg)) return; @@ -97,8 +101,8 @@ static void vga_render_msg(video_frame_info_t *video_info, } else { - x = video_info->font_msg_pos_x; - y = video_info->font_msg_pos_y; + x = video_msg_pos_x; + y = video_msg_pos_y; scale = 1.0f; align = TEXT_ALIGN_LEFT; }