forked from len0rd/rockbox
.rockbox browse fixes, based on patch #861278 by Brian King: (1) Leaving the sub-browser with ON is disabled to prevent possibly endless recursion, (2) For browsing plugins and fonts, the browser doesn't quit automatically after selecting a file, for more convenient use of plugins and trying out different fonts. Additionally, the button bar display is fixed to properly reflect the unavailability of F1 in a sub-browser
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5023 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
0df29b2157
commit
9d5de4ac71
2 changed files with 21 additions and 13 deletions
11
apps/tree.c
11
apps/tree.c
|
|
@ -579,7 +579,8 @@ static int showdir(const char *path, int start, const int *dirfilter)
|
|||
start + tree_max_on_screen, VERTICAL);
|
||||
|
||||
if(global_settings.buttonbar) {
|
||||
buttonbar_set(str(LANG_DIRBROWSE_F1),
|
||||
buttonbar_set(*dirfilter < NUM_FILTER_MODES ?
|
||||
str(LANG_DIRBROWSE_F1) : (unsigned char *) "",
|
||||
str(LANG_DIRBROWSE_F2),
|
||||
str(LANG_DIRBROWSE_F3));
|
||||
buttonbar_draw();
|
||||
|
|
@ -1226,7 +1227,9 @@ static bool dirbrowse(const char *root, const int *dirfilter)
|
|||
|
||||
start_wps = true;
|
||||
}
|
||||
else if (*dirfilter > NUM_FILTER_MODES)
|
||||
else if (*dirfilter > NUM_FILTER_MODES &&
|
||||
*dirfilter != SHOW_FONT &&
|
||||
*dirfilter != SHOW_PLUGINS)
|
||||
exit_func = true;
|
||||
}
|
||||
restore = true;
|
||||
|
|
@ -1329,6 +1332,9 @@ static bool dirbrowse(const char *root, const int *dirfilter)
|
|||
restore = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (*dirfilter < NUM_FILTER_MODES)
|
||||
/* don't catch single ON from .rockbox browsing */
|
||||
{
|
||||
if (mpeg_status() & MPEG_STATUS_PLAY)
|
||||
{
|
||||
|
|
@ -1340,6 +1346,7 @@ static bool dirbrowse(const char *root, const int *dirfilter)
|
|||
restore = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -91,3 +91,4 @@ Steve Cundari
|
|||
Mat Holton
|
||||
Jan Gajdos
|
||||
Antoine Cellerier
|
||||
Brian King
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue