len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-17 12:07:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

draw selection bar even if str is empty string (e.g. in text_editor plugin).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24204 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Teruaki Kawashima 2010-01-09 14:41:00 +00:00
parent ebce81d23f
commit 3d53182cef
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
firmware/drivers/lcd-bitmap-common.c
View file

@ -254,7 +254,8 @@ static void LCDFN(putsxyofs_style)(int xpos, int ypos,
current_vp->drawmode = (style & STYLE_INVERT) ? current_vp->drawmode = (style & STYLE_INVERT) ?
(DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID;
} }
lcd_putsxyofs(xpos, ypos, offset, str); if (str[0])
lcd_putsxyofs(xpos, ypos, offset, str);
current_vp->fg_pattern = oldfgcolor; current_vp->fg_pattern = oldfgcolor;
current_vp->bg_pattern = oldbgcolor; current_vp->bg_pattern = oldbgcolor;
#else #else
@ -262,7 +263,8 @@ static void LCDFN(putsxyofs_style)(int xpos, int ypos,
0 : DRMODE_INVERSEVID); 0 : DRMODE_INVERSEVID);
LCDFN(fillrect)(x, ypos, current_vp->width - xrect, h); LCDFN(fillrect)(x, ypos, current_vp->width - xrect, h);
current_vp->drawmode ^= DRMODE_INVERSEVID; current_vp->drawmode ^= DRMODE_INVERSEVID;
LCDFN(putsxyofs)(xpos, ypos, offset, str); if (str[0])
LCDFN(putsxyofs)(xpos, ypos, offset, str);
#endif #endif
current_vp->drawmode = lastmode; current_vp->drawmode = lastmode;
} }
@ -275,7 +277,7 @@ void LCDFN(puts_style_offset)(int x, int y, const unsigned char *str,
{ {
int xpos, ypos, w, h; int xpos, ypos, w, h;
LCDFN(scroll_stop_line)(current_vp, y); LCDFN(scroll_stop_line)(current_vp, y);
if(!str || !str[0]) if(!str)
return; return;
LCDFN(getstringsize)(str, &w, &h); LCDFN(getstringsize)(str, &w, &h);
@ -323,7 +325,7 @@ void LCDFN(puts_scroll_style_offset)(int x, int y, const unsigned char *string,
return; return;
/* remove any previously scrolling line at the same location */ /* remove any previously scrolling line at the same location */
lcd_scroll_stop_line(current_vp, y); LCDFN(scroll_stop_line)(current_vp, y);
if (LCDFN(scroll_info).lines >= LCDM(SCROLLABLE_LINES)) return; if (LCDFN(scroll_info).lines >= LCDM(SCROLLABLE_LINES)) return;
if (!string) if (!string)