devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix FS#10197 by setting the viewport before calculating the string size.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20943 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-05-15 14:53:06 +00:00
parent d8c7285b2a
commit f4aa7428ea
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/gui/splash.c
View file

@ -61,6 +61,9 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
struct viewport vp; struct viewport vp;
int maxw = 0; int maxw = 0;
viewport_set_defaults(&vp, screen->screen_type);
screen->set_viewport(&vp);
screen->getstringsize(" ", &space_w, &h); screen->getstringsize(" ", &space_w, &h);
#else /* HAVE_LCD_CHARCELLS */ #else /* HAVE_LCD_CHARCELLS */
@ -76,7 +79,7 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
next = strtok_r(splash_buf, " ", &store); next = strtok_r(splash_buf, " ", &store);
if (!next) if (!next)
return; /* nothing to display */ goto end; /* nothing to display */
lines[0] = next; lines[0] = next;
while (true) while (true)
@ -130,7 +133,6 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
screen->stop_scroll(); screen->stop_scroll();
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
viewport_set_defaults(&vp, screen->screen_type);
/* If we center the display, then just clear the box we need and put /* If we center the display, then just clear the box we need and put
a nice little frame and put the text in there! */ a nice little frame and put the text in there! */
vp.y = (screen->lcdheight - y) / 2 - RECT_SPACING; /* height => y start position */ vp.y = (screen->lcdheight - y) / 2 - RECT_SPACING; /* height => y start position */
@ -157,7 +159,6 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
#endif #endif
vp.drawmode = (DRMODE_SOLID|DRMODE_INVERSEVID); vp.drawmode = (DRMODE_SOLID|DRMODE_INVERSEVID);
screen->set_viewport(&vp);
screen->fillrect(0, 0, vp.width, vp.height); screen->fillrect(0, 0, vp.width, vp.height);
#if LCD_DEPTH > 1 #if LCD_DEPTH > 1
@ -196,6 +197,7 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
#undef W #undef W
} }
screen->update_viewport(); screen->update_viewport();
end:
screen->set_viewport(NULL); screen->set_viewport(NULL);
} }