From 3d53182cef03b7d6581ae972d651f5c64d2448b0 Mon Sep 17 00:00:00 2001 From: Teruaki Kawashima Date: Sat, 9 Jan 2010 14:41:00 +0000 Subject: draw selection bar even if str is empty string (e.g. in text_editor plugin). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24204 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/lcd-bitmap-common.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'firmware') diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c index afb7662638..586c74578f 100644 --- a/firmware/drivers/lcd-bitmap-common.c +++ b/firmware/drivers/lcd-bitmap-common.c @@ -254,7 +254,8 @@ static void LCDFN(putsxyofs_style)(int xpos, int ypos, current_vp->drawmode = (style & STYLE_INVERT) ? (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->bg_pattern = oldbgcolor; #else @@ -262,7 +263,8 @@ static void LCDFN(putsxyofs_style)(int xpos, int ypos, 0 : DRMODE_INVERSEVID); LCDFN(fillrect)(x, ypos, current_vp->width - xrect, h); current_vp->drawmode ^= DRMODE_INVERSEVID; - LCDFN(putsxyofs)(xpos, ypos, offset, str); + if (str[0]) + LCDFN(putsxyofs)(xpos, ypos, offset, str); #endif 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; LCDFN(scroll_stop_line)(current_vp, y); - if(!str || !str[0]) + if(!str) return; LCDFN(getstringsize)(str, &w, &h); @@ -323,7 +325,7 @@ void LCDFN(puts_scroll_style_offset)(int x, int y, const unsigned char *string, return; /* 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 (!string) -- cgit v1.2.3