From b2e3c705c555300faec70024d684983356bac49c Mon Sep 17 00:00:00 2001 From: octopuserectus Date: Wed, 10 Jul 2019 19:45:18 +0000 Subject: [PATCH] Fix inconsistensies in button label placement Also fixes text overlap with the new icons in "Theme Menu" --- common/menu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/menu.c b/common/menu.c index cf29df6..5558f23 100644 --- a/common/menu.c +++ b/common/menu.c @@ -542,15 +542,15 @@ void drawButtons(menu_s* menu, bool emptyDir, int *x_image_out) { x_image = x_text - 36; *x_image_out = x_image - 40; - DrawText(fontscale7, x_image, 720 - 47 + 26, themeCurrent.textColor, themeCurrent.buttonYText); - DrawText(interuiregular18, x_text, 720 - 47 + 26, themeCurrent.textColor, textGetString(StrId_NetLoader)); + DrawText(fontscale7, x_image, 720 - 47 + 24, themeCurrent.textColor, themeCurrent.buttonYText); + DrawText(interuiregular18, x_text, 720 - 47 + 24, themeCurrent.textColor, textGetString(StrId_NetLoader)); x_text = GetTextXCoordinate(interuiregular18, x_image - 32, textGetString(StrId_ThemeMenu), 'r'); x_image = x_text - 36; *x_image_out = x_image - 40; - DrawText(fontscale7, x_image, 720 - 47 + 26, themeCurrent.textColor, themeCurrent.buttonMText); - DrawText(interuiregular18, x_text, 720 - 47 + 26, themeCurrent.textColor, textGetString(StrId_ThemeMenu)); + DrawText(fontscale7, x_image, 720 - 47 + 24, themeCurrent.textColor, themeCurrent.buttonMText); + DrawText(interuiregular18, x_text, 720 - 47 + 24, themeCurrent.textColor, textGetString(StrId_ThemeMenu)); } } @@ -693,7 +693,7 @@ void menuLoop(void) { int getX = GetTextXCoordinate(interuiregular18, 1180, textGetString(StrId_ThemeMenu), 'r'); if(hbmenu_state == HBMENU_THEME_MENU) { - DrawText(interuiregular18, getX, 30 + 26 + 32 + 10, themeCurrent.textColor, textGetString(StrId_ThemeMenu)); + DrawText(interuiregular18, getX, 30 + 26 + 32 + 20, themeCurrent.textColor, textGetString(StrId_ThemeMenu)); } else { //DrawText(interuiregular18, getX, 30 + 26 + 32 + 10, themeCurrent.textColor, textGetString(StrId_ThemeMenu)); //DrawText(fontscale7, getX - 40, 30 + 26 + 32 + 10, themeCurrent.textColor, themeCurrent.buttonMText);