summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2008-05-29 14:40:12 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2008-05-29 14:40:12 +0000
commit0792596e1757a5ad91c3959d3721d812c8a282eb (patch)
treec372b19728d615a48374c495678a7007f7534cba
parent0501fb016c4d88d3430a34ecc55a003e062b5f63 (diff)
downloadrockbox-0792596e1757a5ad91c3959d3721d812c8a282eb.tar.gz
rockbox-0792596e1757a5ad91c3959d3721d812c8a282eb.tar.bz2
rockbox-0792596e1757a5ad91c3959d3721d812c8a282eb.zip
the splash should set the viewport to NULL untill we start passing it a vp. (not any time soon though)
"fix" FS#9044 by changing the delete dir screen to use the splash instead so it doesnt have to worry about the statusbar height git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17654 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/splash.c3
-rw-r--r--apps/onplay.c8
2 files changed, 5 insertions, 6 deletions
diff --git a/apps/gui/splash.c b/apps/gui/splash.c
index df0446e62d..1ead051b06 100644
--- a/apps/gui/splash.c
+++ b/apps/gui/splash.c
@@ -214,7 +214,10 @@ void gui_syncsplash(int ticks, const char *fmt, ...)
fmt = P2STR((unsigned char *)fmt);
va_start( ap, fmt );
FOR_NB_SCREENS(i)
+ {
+ screens[i].set_viewport(NULL);
splash(&(screens[i]), fmt, ap);
+ }
va_end( ap );
if(ticks)
diff --git a/apps/onplay.c b/apps/onplay.c
index 6b9669cf5b..ddbe24d152 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -460,7 +460,6 @@ static int remove_dir(char* dirname, int len)
int result = 0;
DIR* dir;
int dirlen = strlen(dirname);
- int i;
dir = opendir(dirname);
if (!dir)
@@ -475,10 +474,7 @@ static int remove_dir(char* dirname, int len)
break;
dirname[dirlen] ='\0';
- FOR_NB_SCREENS(i){
- screens[i].puts(0,1,dirname);
- screens[i].update();
- }
+ gui_syncsplash(0, dirname);
/* append name to current directory */
snprintf(dirname+dirlen, len-dirlen, "/%s", entry->d_name);
@@ -539,7 +535,7 @@ static bool delete_handler(bool is_dir)
if(gui_syncyesno_run(&message, &yes_message, NULL)!=YESNO_YES)
return false;
-
+
gui_syncsplash(0, str(LANG_DELETING));
int res;