From c78c8c839f0b305d39deae8d9401b7b49ab0b39e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 21 Apr 2015 15:45:03 +0200 Subject: [PATCH] Create menu_display_get_dpi --- menu/drivers/glui.c | 14 ++++++-------- menu/menu_display.c | 15 +++++++++++++++ menu/menu_display.h | 2 ++ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index d64c12e329..b61fcb7eca 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -601,15 +601,13 @@ static void *glui_init(void) glui = (glui_handle_t*)menu->userdata; - float dpi = 128; - if (!gfx_ctx_get_metrics(DISPLAY_METRIC_DPI, &dpi)) - dpi = 128; + float dpi = menu_display_get_dpi(menu); - glui->line_height = dpi/3; - glui->margin = dpi/6; - glui->ticker_limit = dpi/3; - menu->header_height = dpi/3; - glui->font.size = dpi/8; + glui->line_height = dpi / 3; + glui->margin = dpi / 6; + glui->ticker_limit = dpi / 3; + menu->header_height = dpi / 3; + glui->font.size = dpi / 8; glui->textures.bg.id = 0; if (font_driver->bind_block && font_driver->flush) diff --git a/menu/menu_display.c b/menu/menu_display.c index cc361afecc..d5d51d8c02 100644 --- a/menu/menu_display.c +++ b/menu/menu_display.c @@ -18,6 +18,7 @@ #include "menu_animation.h" #include "../dynamic.h" #include "../../retroarch.h" +#include "../gfx/video_context_driver.h" bool menu_display_update_pending(void) { @@ -84,3 +85,17 @@ bool menu_display_init(void *data) return true; } + +float menu_display_get_dpi(void *data) +{ + float dpi, dpi_orig = 128; + menu_handle_t *menu = (menu_handle_t*)data; + + if (!menu) + return dpi_orig; + + if (!gfx_ctx_get_metrics(DISPLAY_METRIC_DPI, &dpi)) + dpi = dpi_orig; + + return dpi; +} diff --git a/menu/menu_display.h b/menu/menu_display.h index 2d4b64ed02..9e09091213 100644 --- a/menu/menu_display.h +++ b/menu/menu_display.h @@ -28,6 +28,8 @@ bool menu_display_init(void *data); bool menu_display_update_pending(void); +float menu_display_get_dpi(void *data); + #ifdef __cplusplus } #endif