len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc.c show_logo remove 'ver.' when screen is too small

Browse source 
since its too early for the scroll engine just remove 'ver. '

cleanup the getstringsize calls, only need to calculate it once

Change-Id: I5e866733ed38ffa0bf34ce1b5e11ed3afd78a04a
This commit is contained in:
William Wilgus 2022-11-09 03:04:50 -05:00
parent 51c1e3ce7f
commit e8aaee4979
1 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

37
apps/misc.c
View file

@ -748,25 +748,32 @@ long default_event_handler(long event)
int show_logo( void ) int show_logo( void )
{ {
char version[32]; unsigned char version[32];
int font_h, font_w; int font_h, ver_w;
snprintf(version, sizeof(version), "Ver. %s", rbversion); snprintf(version, sizeof(version), "Ver. %s", rbversion);
ver_w = font_getstringsize(version, NULL, &font_h, FONT_SYSFIXED);
lcd_clear_display(); lcd_clear_display();
lcd_setfont(FONT_SYSFIXED);
#if defined(SANSA_CLIP) || defined(SANSA_CLIPV2) || defined(SANSA_CLIPPLUS) #if defined(SANSA_CLIP) || defined(SANSA_CLIPV2) || defined(SANSA_CLIPPLUS)
/* display the logo in the blue area of the screen (bottom 48 pixels) */ /* display the logo in the blue area of the screen (bottom 48 pixels) */
lcd_setfont(FONT_SYSFIXED); if (ver_w > LCD_WIDTH)
lcd_getstringsize((unsigned char *)"A", &font_w, &font_h); lcd_putsxy(0, 0, rbversion);
lcd_putsxy((LCD_WIDTH/2) - ((strlen(version)*font_w)/2), else
0, (unsigned char *)version); lcd_putsxy((LCD_WIDTH/2) - (ver_w/2), 0, version);
lcd_bmp(&bm_rockboxlogo, (LCD_WIDTH - BMPWIDTH_rockboxlogo) / 2, 16); lcd_bmp(&bm_rockboxlogo, (LCD_WIDTH - BMPWIDTH_rockboxlogo) / 2, 16);
#else #else
lcd_bmp(&bm_rockboxlogo, (LCD_WIDTH - BMPWIDTH_rockboxlogo) / 2, 10); lcd_bmp(&bm_rockboxlogo, (LCD_WIDTH - BMPWIDTH_rockboxlogo) / 2, 10);
lcd_setfont(FONT_SYSFIXED);
lcd_getstringsize((unsigned char *)"A", &font_w, &font_h); if (ver_w > LCD_WIDTH)
lcd_putsxy((LCD_WIDTH/2) - ((strlen(version)*font_w)/2), lcd_putsxy(0, LCD_HEIGHT-font_h, rbversion);
LCD_HEIGHT-font_h, (unsigned char *)version); else
lcd_putsxy((LCD_WIDTH/2) - (ver_w/2), LCD_HEIGHT-font_h, version);
#endif #endif
lcd_setfont(FONT_UI); lcd_setfont(FONT_UI);
@ -776,9 +783,13 @@ int show_logo( void )
lcd_remote_clear_display(); lcd_remote_clear_display();
lcd_remote_bmp(&bm_remote_rockboxlogo, 0, 10); lcd_remote_bmp(&bm_remote_rockboxlogo, 0, 10);
lcd_remote_setfont(FONT_SYSFIXED); lcd_remote_setfont(FONT_SYSFIXED);
lcd_remote_getstringsize((unsigned char *)"A", &font_w, &font_h);
lcd_remote_putsxy((LCD_REMOTE_WIDTH/2) - ((strlen(version)*font_w)/2), if (ver_w > LCD_REMOTE_WIDTH)
LCD_REMOTE_HEIGHT-font_h, (unsigned char *)version); lcd_remote_putsxy(0, LCD_REMOTE_HEIGHT-font_h, rbversion);
else
lcd_remote_putsxy((LCD_REMOTE_WIDTH/2) - (ver_w/2),
LCD_REMOTE_HEIGHT-font_h, version);
lcd_remote_setfont(FONT_UI); lcd_remote_setfont(FONT_UI);
lcd_remote_update(); lcd_remote_update();
#endif #endif