From fb2d6a7a3a15f33b06b8efc3c0e5d93ae12cfbc2 Mon Sep 17 00:00:00 2001 From: Alexander Levin Date: Sun, 23 Jan 2011 21:49:49 +0000 Subject: Respect the 'scroll delay' setting more accurately between scrolling rounds git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29123 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/lcd-bitmap-common.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'firmware/drivers/lcd-bitmap-common.c') diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c index fa18f9fa1f..1a504c6f40 100644 --- a/firmware/drivers/lcd-bitmap-common.c +++ b/firmware/drivers/lcd-bitmap-common.c @@ -435,6 +435,7 @@ void LCDFN(scroll_fn)(void) int index; int xpos, ypos; struct viewport* old_vp = current_vp; + bool makedelay = false; for ( index = 0; index < LCDFN(scroll_info).lines; index++ ) { s = &LCDFN(scroll_info).scroll[index]; @@ -459,26 +460,31 @@ void LCDFN(scroll_fn)(void) /* at beginning of line */ s->offset = 0; s->backward = false; - s->start_tick = current_tick + LCDFN(scroll_info).delay * 2; + makedelay = true; } - if (s->offset >= s->width - (current_vp->width - xpos)) { + else if (s->offset >= s->width - (current_vp->width - xpos)) { /* at end of line */ s->offset = s->width - (current_vp->width - xpos); s->backward = true; - s->start_tick = current_tick + LCDFN(scroll_info).delay * 2; + makedelay = true; } } else { /* scroll forward the whole time */ if (s->offset >= s->width) { s->offset = 0; - s->start_tick = current_tick + LCDFN(scroll_info).delay * 2; + makedelay = true; } } + + if (makedelay) + s->start_tick = current_tick + LCDFN(scroll_info).delay + + LCDFN(scroll_info).ticks; + LCDFN(putsxyofs_style)(xpos, ypos, s->line, s->style, s->width, pf->height, s->offset); LCDFN(update_viewport_rect)(xpos, ypos, current_vp->width - xpos, - pf->height); + pf->height); } LCDFN(set_viewport)(old_vp); } -- cgit v1.2.3