diff options
author | Mark Arigo <markarigo@gmail.com> | 2006-08-23 20:07:59 +0000 |
---|---|---|
committer | Mark Arigo <markarigo@gmail.com> | 2006-08-23 20:07:59 +0000 |
commit | 1e9ac7a32e580587bdd5199f737c5bc2a92551f1 (patch) | |
tree | 3a9b5c18f279f9493391d4533cf6f4d9f889d3ac /firmware/drivers/lcd-h100.c | |
parent | 34301bb37bb34f478bf4c3fc78385929dd2533d8 (diff) | |
download | rockbox-1e9ac7a32e580587bdd5199f737c5bc2a92551f1.tar.gz rockbox-1e9ac7a32e580587bdd5199f737c5bc2a92551f1.zip |
Allow scrolling lines with different x-margins. The margin at the time of the call to puts_scroll will be used as the margin for that line.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10727 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/lcd-h100.c')
-rw-r--r-- | firmware/drivers/lcd-h100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/drivers/lcd-h100.c b/firmware/drivers/lcd-h100.c index fd456007df..8407876d34 100644 --- a/firmware/drivers/lcd-h100.c +++ b/firmware/drivers/lcd-h100.c | |||
@@ -1224,7 +1224,7 @@ void lcd_puts_scroll_style_offset(int x, int y, const unsigned char *string, | |||
1224 | 1224 | ||
1225 | s->len = utf8length((char *)string); | 1225 | s->len = utf8length((char *)string); |
1226 | s->offset = offset; | 1226 | s->offset = offset; |
1227 | s->startx = x; | 1227 | s->startx = xmargin + x * s->width / s->len; |
1228 | s->backward = false; | 1228 | s->backward = false; |
1229 | scrolling_lines |= (1<<y); | 1229 | scrolling_lines |= (1<<y); |
1230 | } | 1230 | } |
@@ -1262,7 +1262,7 @@ static void scroll_thread(void) | |||
1262 | s->offset += scroll_step; | 1262 | s->offset += scroll_step; |
1263 | 1263 | ||
1264 | pf = font_get(curfont); | 1264 | pf = font_get(curfont); |
1265 | xpos = xmargin + s->startx * s->width / s->len; | 1265 | xpos = s->startx; |
1266 | ypos = ymargin + index * pf->height; | 1266 | ypos = ymargin + index * pf->height; |
1267 | 1267 | ||
1268 | if (s->bidir) { /* scroll bidirectional */ | 1268 | if (s->bidir) { /* scroll bidirectional */ |