forked from len0rd/rockbox
(all targets) Increase scrolling line size to account for utf-8 in the overlap. (player) Fix utf-8-related scroll-around display bug.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12943 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
45581245de
commit
a4ef0c4897
2 changed files with 3 additions and 3 deletions
|
|
@ -520,7 +520,7 @@ void lcd_puts_scroll_offset(int x, int y, const unsigned char *string,
|
||||||
}
|
}
|
||||||
|
|
||||||
end = strchr(s->line, '\0');
|
end = strchr(s->line, '\0');
|
||||||
strncpy(end, string, LCD_WIDTH);
|
strncpy(end, string, utf8seek(s->line, LCD_WIDTH));
|
||||||
|
|
||||||
s->offset = offset;
|
s->offset = offset;
|
||||||
s->startx = xmargin + x;
|
s->startx = xmargin + x;
|
||||||
|
|
|
||||||
|
|
@ -382,9 +382,9 @@ extern void lcd_bitmap_transparent(const fb_data *src, int x, int y,
|
||||||
/* internal usage, but in multiple drivers */
|
/* internal usage, but in multiple drivers */
|
||||||
#define SCROLL_SPACING 3
|
#define SCROLL_SPACING 3
|
||||||
#ifdef HAVE_LCD_BITMAP
|
#ifdef HAVE_LCD_BITMAP
|
||||||
#define SCROLL_LINE_SIZE (MAX_PATH + LCD_WIDTH/2 + SCROLL_SPACING + 2)
|
#define SCROLL_LINE_SIZE (MAX_PATH + SCROLL_SPACING + 3*LCD_WIDTH/2 + 2)
|
||||||
#else
|
#else
|
||||||
#define SCROLL_LINE_SIZE (MAX_PATH + LCD_WIDTH + SCROLL_SPACING + 2)
|
#define SCROLL_LINE_SIZE (MAX_PATH + SCROLL_SPACING + 3*LCD_WIDTH + 2)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
struct scrollinfo {
|
struct scrollinfo {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue