From 87aca212ce6c0d275c9ad89760f02f241fce0949 Mon Sep 17 00:00:00 2001 From: Daniel Bernard Date: Sun, 7 Oct 2018 12:39:27 -0500 Subject: [PATCH] Shrink charge element size and position to accommodate Theme Menu --- common/menu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/menu.c b/common/menu.c index eff5790..ae8f592 100644 --- a/common/menu.c +++ b/common/menu.c @@ -335,12 +335,12 @@ void menuStartup(void) { if(themeGlobalPreset == THEME_PRESET_DARK) { theme_icon_small = downscaleImg(theme_icon_dark_bin, 256, 256, 140, 140, IMAGE_MODE_RGB24); - charging_icon_small = downscaleImg(charging_icon_white_bin, 155, 256, 14, 23, IMAGE_MODE_RGBA32); + charging_icon_small = downscaleImg(charging_icon_white_bin, 155, 256, 9, 15, IMAGE_MODE_RGBA32); } else { theme_icon_small = downscaleImg(theme_icon_light_bin, 256, 256, 140, 140, IMAGE_MODE_RGB24); - charging_icon_small = downscaleImg(charging_icon_black_bin, 155, 256, 14, 23, IMAGE_MODE_RGBA32); + charging_icon_small = downscaleImg(charging_icon_black_bin, 155, 256, 9, 15, IMAGE_MODE_RGBA32); } computeFrontGradient(themeCurrent.frontWaveColor, 280); //menuCreateMsgBox(780, 300, "This is a test"); @@ -455,16 +455,16 @@ void drawCharge() { sprintf(chargeString, "%d%%", (int)batteryCharge); - int tmpX = GetTextXCoordinate(interuimedium20, 1180, chargeString, 'r'); + int tmpX = GetTextXCoordinate(interuiregular14, 1180, chargeString, 'r'); - DrawText(interuimedium20, tmpX, 0 + 47 + 10 + 32, themeCurrent.textColor, chargeString); + DrawText(interuiregular14, tmpX, 0 + 47 + 10 + 21, themeCurrent.textColor, chargeString); #ifdef __SWITCH__ psmGetChargerType(&chargeType); #endif if (chargeType > (ChargerType)ChargerType_None) - drawImage(tmpX - 20, 0 + 47 + 10 + 9, 14, 23, charging_icon_small, IMAGE_MODE_RGBA32); + drawImage(tmpX - 20, 0 + 47 + 10 + 5, 9, 15, charging_icon_small, IMAGE_MODE_RGBA32); } void drawBackBtn(menu_s* menu, bool emptyDir) {