Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use the statusbar setting while in the bookmark screen, so that the shuffle/repeat icons for the bookmark can be visible on bitmap displays. Also simplify the code a little.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12403 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Magnus Holmgren 2007-02-19 18:07:27 +00:00
parent a3ce8e1670
commit 9e017a33f5
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/bookmark.c
View file

@ -497,10 +497,10 @@ static char* select_bookmark(const char* bookmark_file_name)
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
int i; int i;
int x = lcd_getxmargin();
int y = lcd_getymargin();
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
screens[i].setmargins(0, 0); screens[i].setmargins(0, global_settings.statusbar
? STATUSBAR_HEIGHT : 0);
#endif #endif
bookmark_count = get_bookmark_count(bookmark_file_name); bookmark_count = get_bookmark_count(bookmark_file_name);
@ -547,11 +547,6 @@ static char* select_bookmark(const char* bookmark_file_name)
{ {
case ACTION_BMS_SELECT: case ACTION_BMS_SELECT:
/* User wants to use this bookmark */ /* User wants to use this bookmark */
#ifdef HAVE_LCD_BITMAP
FOR_NB_SCREENS(i)
screens[i].setmargins(0, global_settings.statusbar
? STATUSBAR_HEIGHT : 0);
#endif
action_signalscreenchange(); action_signalscreenchange();
return bookmark; return bookmark;
@ -575,10 +570,6 @@ static char* select_bookmark(const char* bookmark_file_name)
break; break;
case ACTION_BMS_EXIT: case ACTION_BMS_EXIT:
#ifdef HAVE_LCD_BITMAP
FOR_NB_SCREENS(i)
screens[i].setmargins(x, y);
#endif
action_signalscreenchange(); action_signalscreenchange();
return NULL; return NULL;
@ -671,10 +662,7 @@ static void display_bookmark(const char* bookmark,
global_filename); global_filename);
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
{
screens[i].clear_display(); screens[i].clear_display();
screens[i].stop_scroll();
}
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
/* bookmark shuffle and repeat states*/ /* bookmark shuffle and repeat states*/