From 50c89847f061ad67dcbf89b1e6ffa198f9a02552 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 12 Feb 2015 19:35:24 +0100 Subject: [PATCH] Backport new element display settings to GLUI/RGUI --- menu/drivers/glui.c | 30 +++++++++++++++++------------- menu/drivers/rgui.c | 30 ++++++++++++++++++------------ menu/drivers/xmb.c | 18 +++++++++--------- 3 files changed, 44 insertions(+), 34 deletions(-) diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c index ad8adcf596..d91b5ab629 100644 --- a/menu/drivers/glui.c +++ b/menu/drivers/glui.c @@ -314,28 +314,32 @@ static void glui_frame(menu_handle_t *menu) if (!core_name) core_name = "No Core"; - core_version = g_extern.menu.info.library_version; - if (!core_version) - core_version = g_extern.system.info.library_version; - if (!core_version) - core_version = ""; + if (g_settings.menu.core_enable) + { + core_version = g_extern.menu.info.library_version; + if (!core_version) + core_version = g_extern.system.info.library_version; + if (!core_version) + core_version = ""; - snprintf(title_msg, sizeof(title_msg), "%s - %s %s", PACKAGE_VERSION, - core_name, core_version); + snprintf(title_msg, sizeof(title_msg), "%s - %s %s", PACKAGE_VERSION, + core_name, core_version); - disp_timedate_set_label(timedate, sizeof(timedate), 0); + glui_blit_line(gl, + glui->margin * 2, + glui->margin + glui->term_height * glui->line_height + + glui->line_height * 2, title_msg, true); + } - glui_blit_line(gl, - glui->margin * 2, - glui->margin + glui->term_height * glui->line_height - + glui->line_height * 2, title_msg, true); if (g_settings.menu.timedate_enable) + { + disp_timedate_set_label(timedate, sizeof(timedate), 0); glui_blit_line(gl, glui->margin * 14, glui->margin + glui->term_height * glui->line_height + glui->line_height * 2, timedate, true); - + } x = glui->margin; y = glui->margin + glui->line_height * 2; diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index e58fc1495f..4dce438936 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -353,26 +353,32 @@ static void rgui_render(menu_handle_t *menu) if (!core_name) core_name = "No Core"; - core_version = g_extern.menu.info.library_version; - if (!core_version) - core_version = g_extern.system.info.library_version; - if (!core_version) - core_version = ""; + if (g_settings.menu.core_enable) + { + core_version = g_extern.menu.info.library_version; + if (!core_version) + core_version = g_extern.system.info.library_version; + if (!core_version) + core_version = ""; - disp_timedate_set_label(timedate, sizeof(timedate), 3); - snprintf(title_msg, sizeof(title_msg), "%s - %s %s", PACKAGE_VERSION, - core_name, core_version); - blit_line(menu, - RGUI_TERM_START_X + RGUI_TERM_START_X, - (RGUI_TERM_HEIGHT * FONT_HEIGHT_STRIDE) + - RGUI_TERM_START_Y + 2, title_msg, true); + snprintf(title_msg, sizeof(title_msg), "%s - %s %s", PACKAGE_VERSION, + core_name, core_version); + blit_line(menu, + RGUI_TERM_START_X + RGUI_TERM_START_X, + (RGUI_TERM_HEIGHT * FONT_HEIGHT_STRIDE) + + RGUI_TERM_START_Y + 2, title_msg, true); + } if (g_settings.menu.timedate_enable) + { + disp_timedate_set_label(timedate, sizeof(timedate), 3); + blit_line(menu, (RGUI_TERM_WIDTH * FONT_HEIGHT_STRIDE) + (60), (RGUI_TERM_HEIGHT * FONT_HEIGHT_STRIDE) + RGUI_TERM_START_Y + 2, timedate, true); + } x = RGUI_TERM_START_X; diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 19b2e69fe8..98e6f48636 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1023,20 +1023,13 @@ static void xmb_frame(menu_handle_t *menu) xmb_render_background(gl, xmb, false); - core_name = g_extern.menu.info.library_name; - - if (!core_name) - core_name = g_extern.system.info.library_name; - if (!core_name) - core_name = "No Core"; - xmb_draw_text(gl, xmb, xmb->title.name, xmb->title.margin.left, xmb->title.margin.top, 1, 1, 0); - disp_timedate_set_label(timedate, sizeof(timedate), 0); - if (g_settings.menu.timedate_enable) { + disp_timedate_set_label(timedate, sizeof(timedate), 0); + xmb_draw_text(gl, xmb, timedate, gl->win_width - xmb->title.margin.left - xmb->icon.size / 4, xmb->title.margin.top, 1, 1, 1); @@ -1047,6 +1040,13 @@ static void xmb_frame(menu_handle_t *menu) if (g_settings.menu.core_enable) { + core_name = g_extern.menu.info.library_name; + + if (!core_name) + core_name = g_extern.system.info.library_name; + if (!core_name) + core_name = "No Core"; + core_version = g_extern.menu.info.library_version; if (!core_version)