diff --git a/apps/settings_list.c b/apps/settings_list.c index 5fd7e0459b..699afb92fd 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -240,8 +240,10 @@ static const char graphic_numeric[] = "graphic,numeric"; #define DEFAULT_FONTNAME "08-Rockfont" #elif LCD_HEIGHT <= 220 #define DEFAULT_FONT_HEIGHT 12 -#elif LCD_HEIGHT <= 320 +#elif LCD_HEIGHT <= 240 #define DEFAULT_FONT_HEIGHT 15 +#elif LCD_HEIGHT <= 320 + #define DEFAULT_FONT_HEIGHT 18 #elif defined(SHANLING_Q1) /* 16pt font looks pretty aliased & ugly */ #define DEFAULT_FONT_HEIGHT 18 diff --git a/wps/WPSLIST b/wps/WPSLIST index efb1030585..596f548747 100644 --- a/wps/WPSLIST +++ b/wps/WPSLIST @@ -116,7 +116,7 @@ Font.360x400x16: 18-Adobe-Helvetica.fnt Font.320x480x(16|24): 27-Adobe-Helvetica.fnt Font.320x240x(16|24): 15-Adobe-Helvetica.fnt Font.240x400x(16|24): 16-Adobe-Helvetica.fnt -Font.240x320x(16|24|32): 15-Adobe-Helvetica.fnt +Font.240x320x(16|24|32): 18-Adobe-Helvetica.fnt Font.220x176x(16|24): 12-Adobe-Helvetica.fnt Font.176x220x(16|24): 12-Adobe-Helvetica.fnt Font.176x132x(16|24): 12-Adobe-Helvetica.fnt diff --git a/wps/cabbiev2.240x320x16.wps b/wps/cabbiev2.240x320x16.wps index ab6ca535fd..95a056b123 100644 --- a/wps/cabbiev2.240x320x16.wps +++ b/wps/cabbiev2.240x320x16.wps @@ -52,16 +52,15 @@ %al%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr # # Album Art -%ax%Vl(a,55,30,130,130,-) -%Cl(0,0,130,130,c,c) +%ax%Vl(a,47,30,140,140,-) +%Cl(0,0,140,140,c,c) %Cd # # Track Info - Album Art -%ax%Vl(a,0,165,-,78,1) +%ax%Vl(a,0,175,-,72,1) %s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>> %s%ac%?it<%it|%fn> %s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>> - %s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn> # # Track Info - No Album Art @@ -74,7 +73,6 @@ %ac%?ig<%ig|> %ac%?fv<%(vbr%) |>%fb kbit/s %fc - %ac%Sx(Next:) %s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>> %ac%s%?It<%It|%Fn>