diff options
author | Thomas Martitz <kugel@rockbox.org> | 2013-04-03 16:33:23 +0200 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2013-12-14 23:11:30 +0100 |
commit | 1c5d0b41eebdb4f8c627b1a0e5f7b699f0b08fb8 (patch) | |
tree | 3ec44a4e6cfe4bfaab689e765ef3546d8dac730d /firmware/drivers/lcd-bitmap-common.c | |
parent | 47c8d3c14d8fdaf4749ef5e0380fb0c52140b5fb (diff) | |
download | rockbox-1c5d0b41eebdb4f8c627b1a0e5f7b699f0b08fb8.tar.gz rockbox-1c5d0b41eebdb4f8c627b1a0e5f7b699f0b08fb8.zip |
scroll_engine: Rename scroll_stop* functions to be more consistent with the lcd api.
Change-Id: I8ada10b96bfb628cca0331689e8b936ae47c7e1c
Diffstat (limited to 'firmware/drivers/lcd-bitmap-common.c')
-rw-r--r-- | firmware/drivers/lcd-bitmap-common.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c index a17ac51006..10a567edf1 100644 --- a/firmware/drivers/lcd-bitmap-common.c +++ b/firmware/drivers/lcd-bitmap-common.c | |||
@@ -178,6 +178,12 @@ void LCDFN(set_viewport)(struct viewport* vp) | |||
178 | #endif | 178 | #endif |
179 | } | 179 | } |
180 | 180 | ||
181 | struct viewport *LCDFN(get_viewport)(bool *is_default) | ||
182 | { | ||
183 | *is_default = (current_vp == &default_vp); | ||
184 | return current_vp; | ||
185 | } | ||
186 | |||
181 | void LCDFN(update_viewport)(void) | 187 | void LCDFN(update_viewport)(void) |
182 | { | 188 | { |
183 | LCDFN(update_rect)(current_vp->x, current_vp->y, | 189 | LCDFN(update_rect)(current_vp->x, current_vp->y, |
@@ -405,7 +411,7 @@ void LCDFN(puts_style_xyoffset)(int x, int y, const unsigned char *str, | |||
405 | int style, int x_offset, int y_offset) | 411 | int style, int x_offset, int y_offset) |
406 | { | 412 | { |
407 | int xpos, ypos, h; | 413 | int xpos, ypos, h; |
408 | LCDFN(scroll_stop_line)(current_vp, y); | 414 | LCDFN(scroll_stop_viewport_line)(current_vp, y); |
409 | if(!str) | 415 | if(!str) |
410 | return; | 416 | return; |
411 | 417 | ||
@@ -491,7 +497,7 @@ void LCDFN(puts_scroll_style_xyoffset)(int x, int y, const unsigned char *string | |||
491 | if (restart) | 497 | if (restart) |
492 | { | 498 | { |
493 | /* remove any previously scrolling line at the same location */ | 499 | /* remove any previously scrolling line at the same location */ |
494 | LCDFN(scroll_stop_line)(current_vp, y); | 500 | LCDFN(scroll_stop_viewport_line)(current_vp, y); |
495 | 501 | ||
496 | if (LCDFN(scroll_info).lines >= LCDM(SCROLLABLE_LINES)) return; | 502 | if (LCDFN(scroll_info).lines >= LCDM(SCROLLABLE_LINES)) return; |
497 | LCDFN(puts_style_xyoffset)(x, y, string, style, x_offset, y_offset); | 503 | LCDFN(puts_style_xyoffset)(x, y, string, style, x_offset, y_offset); |