From 21db7b262a7a75a8071deb99c08b4531779c9276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Sat, 18 Oct 2014 14:51:50 +0200 Subject: [PATCH] (Menu) Adjust margins --- frontend/menu/disp/lakka.c | 10 +++++----- frontend/menu/disp/xmb.c | 14 ++++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/frontend/menu/disp/lakka.c b/frontend/menu/disp/lakka.c index 185922d0e4..ed3bdc6d0c 100644 --- a/frontend/menu/disp/lakka.c +++ b/frontend/menu/disp/lakka.c @@ -1153,8 +1153,8 @@ static void *lakka_init(void) lakka->above_subitem_offset = 1.5; lakka->above_item_offset = -1.0; - lakka->active_item_factor = 2.75; - lakka->under_item_offset = 4.0; + lakka->active_item_factor = 3.0; + lakka->under_item_offset = 5.0; float scale_factor; @@ -1188,9 +1188,9 @@ static void *lakka_init(void) lakka->hspacing = 200.0 * scale_factor; lakka->vspacing = 64.0 * scale_factor; lakka->margin_left = 336.0 * scale_factor; - lakka->margin_top = 256 * scale_factor; - lakka->title_margin_left = 15.0 * scale_factor; - lakka->title_margin_top = 20.0 * scale_factor + g_settings.video.font_size/3.0; + lakka->margin_top = (256+32) * scale_factor; + lakka->title_margin_left = 60 * scale_factor; + lakka->title_margin_top = 60 * scale_factor + g_settings.video.font_size/3; lakka->label_margin_left = 85.0 * scale_factor; lakka->label_margin_top = g_settings.video.font_size/3.0; lakka->setting_margin_left = 600.0 * scale_factor; diff --git a/frontend/menu/disp/xmb.c b/frontend/menu/disp/xmb.c index 72c4b64671..cb83109e5d 100644 --- a/frontend/menu/disp/xmb.c +++ b/frontend/menu/disp/xmb.c @@ -90,6 +90,7 @@ typedef struct xmb_handle float margin_top; float title_margin_left; float title_margin_top; + float title_margin_bottom; float label_margin_left; float label_margin_top; float setting_margin_left; @@ -477,7 +478,7 @@ static void xmb_frame(void) snprintf(title_msg, sizeof(title_msg), "%s - %s %s", PACKAGE_VERSION, core_name, core_version); xmb_draw_text(title_msg, xmb->title_margin_left, - gl->win_height - xmb->title_margin_top/2, 1, 1); + gl->win_height - xmb->title_margin_bottom, 1, 1); end = menu_list_get_size(driver.menu->menu_list); current = driver.menu->selection_ptr; @@ -644,8 +645,8 @@ static void *xmb_init(void) xmb->above_subitem_offset = 1.5; xmb->above_item_offset = -1.0; - xmb->active_item_factor = 2.75; - xmb->under_item_offset = 4.0; + xmb->active_item_factor = 3.0; + xmb->under_item_offset = 5.0; float scale_factor; @@ -679,9 +680,10 @@ static void *xmb_init(void) xmb->hspacing = 200.0 * scale_factor; xmb->vspacing = 64.0 * scale_factor; xmb->margin_left = 336.0 * scale_factor; - xmb->margin_top = 256 * scale_factor; - xmb->title_margin_left = 15.0 * scale_factor; - xmb->title_margin_top = 20.0 * scale_factor + g_settings.video.font_size/3.0; + xmb->margin_top = (256+32) * scale_factor; + xmb->title_margin_left = 60 * scale_factor; + xmb->title_margin_top = 60 * scale_factor + g_settings.video.font_size/3; + xmb->title_margin_bottom = 60 * scale_factor - g_settings.video.font_size/3; xmb->label_margin_left = 85.0 * scale_factor; xmb->label_margin_top = g_settings.video.font_size/3.0; xmb->setting_margin_left = 600.0 * scale_factor;