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-remote.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-remote.c')
-rw-r--r-- | firmware/drivers/lcd-h100-remote.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/drivers/lcd-h100-remote.c b/firmware/drivers/lcd-h100-remote.c index bf4445462d..ed5816cebf 100644 --- a/firmware/drivers/lcd-h100-remote.c +++ b/firmware/drivers/lcd-h100-remote.c | |||
@@ -1388,7 +1388,7 @@ void lcd_remote_puts_scroll_style_offset(int x, int y, const unsigned char *stri | |||
1388 | 1388 | ||
1389 | s->len = utf8length((char *)string); | 1389 | s->len = utf8length((char *)string); |
1390 | s->offset = offset; | 1390 | s->offset = offset; |
1391 | s->startx = x; | 1391 | s->startx = xmargin + x * s->width / s->len;; |
1392 | s->backward = false; | 1392 | s->backward = false; |
1393 | scrolling_lines |= (1<<y); | 1393 | scrolling_lines |= (1<<y); |
1394 | } | 1394 | } |
@@ -1458,7 +1458,7 @@ static void scroll_thread(void) | |||
1458 | s->offset += scroll_step; | 1458 | s->offset += scroll_step; |
1459 | 1459 | ||
1460 | pf = font_get(curfont); | 1460 | pf = font_get(curfont); |
1461 | xpos = xmargin + s->startx * s->width / s->len; | 1461 | xpos = s->startx; |
1462 | ypos = ymargin + index * pf->height; | 1462 | ypos = ymargin + index * pf->height; |
1463 | 1463 | ||
1464 | if (s->bidir) { /* scroll bidirectional */ | 1464 | if (s->bidir) { /* scroll bidirectional */ |