summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-09-04 00:40:50 +0000
committerThomas Martitz <kugel@rockbox.org>2009-09-04 00:40:50 +0000
commit2ab627d3097ac7098741a724fc27b1c261473d4f (patch)
tree08c56f300aa5a52128a43617e91caeb406d71594 /apps/gui
parent3f2e28b0f551fe30b443739b539f3df41969262d (diff)
downloadrockbox-2ab627d3097ac7098741a724fc27b1c261473d4f.zip
rockbox-2ab627d3097ac7098741a724fc27b1c261473d4f.tar.gz
rockbox-2ab627d3097ac7098741a724fc27b1c261473d4f.tar.bz2
rockbox-2ab627d3097ac7098741a724fc27b1c261473d4f.tar.xz
Change r22610 a bit. The new parent viewport isn't really suitable.
The new parent might be smaller than the previous one, causing the old list to not stop scrolling. Full-screen stop scrolling isn't correct either though, so we pick the currnet ui viewport to stop scrolling. This was actually a bug (attempted to fix in r22610) discovered in the custom statusbar patch, where the lists stopped the statusbar text from scrolling. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22613 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/bitmap/list.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c
index 046621e..c474c32 100644
--- a/apps/gui/bitmap/list.c
+++ b/apps/gui/bitmap/list.c
@@ -104,6 +104,9 @@ void list_draw(struct screen *display, struct gui_synclist *list)
const bool show_cursor = !global_settings.cursor_style &&
list->show_selection_marker;
struct viewport *parent = (list->parent[screen]);
+ /* the below returns a pointer to a viewport array which is
+ * NB_SCREENS long */
+ struct viewport *ui_vp = viewport_get_current_vp();
#ifdef HAVE_LCD_COLOR
unsigned char cur_line = 0;
#endif
@@ -112,7 +115,7 @@ void list_draw(struct screen *display, struct gui_synclist *list)
line_height = font_get(parent->font)->height;
display->set_viewport(parent);
display->clear_viewport();
- display->scroll_stop(parent);
+ display->scroll_stop(&ui_vp[screen]);
list_text[screen] = *parent;
if ((show_title = draw_title(display, list)))
{