diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-09-04 16:34:55 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-09-04 16:34:55 +0000 |
commit | 3c47d94668c2129ab5cc50ef1c58dc37a5bc00a4 (patch) | |
tree | 6b5db0fd97ff24f6b2b9ad1b761a35c9bf05d30a /apps/gui/bitmap | |
parent | 0cb68032275c7b15200a8766ed8c487689175b24 (diff) | |
download | rockbox-3c47d94668c2129ab5cc50ef1c58dc37a5bc00a4.tar.gz rockbox-3c47d94668c2129ab5cc50ef1c58dc37a5bc00a4.zip |
Alright, it seems I got scroll_stop() wrong. Using the viewport that's set before doing all the puts_scroll* calls seems to work.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22622 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/bitmap')
-rw-r--r-- | apps/gui/bitmap/list.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c index c474c329ff..94870538d6 100644 --- a/apps/gui/bitmap/list.c +++ b/apps/gui/bitmap/list.c | |||
@@ -66,6 +66,7 @@ static bool draw_title(struct screen *display, struct gui_synclist *list) | |||
66 | { | 66 | { |
67 | const int screen = display->screen_type; | 67 | const int screen = display->screen_type; |
68 | int style = STYLE_DEFAULT; | 68 | int style = STYLE_DEFAULT; |
69 | display->scroll_stop(&title_text[screen]); | ||
69 | if (!list_display_title(list, screen)) | 70 | if (!list_display_title(list, screen)) |
70 | return false; | 71 | return false; |
71 | title_text[screen] = *(list->parent[screen]); | 72 | title_text[screen] = *(list->parent[screen]); |
@@ -104,9 +105,6 @@ void list_draw(struct screen *display, struct gui_synclist *list) | |||
104 | const bool show_cursor = !global_settings.cursor_style && | 105 | const bool show_cursor = !global_settings.cursor_style && |
105 | list->show_selection_marker; | 106 | list->show_selection_marker; |
106 | struct viewport *parent = (list->parent[screen]); | 107 | struct viewport *parent = (list->parent[screen]); |
107 | /* the below returns a pointer to a viewport array which is | ||
108 | * NB_SCREENS long */ | ||
109 | struct viewport *ui_vp = viewport_get_current_vp(); | ||
110 | #ifdef HAVE_LCD_COLOR | 108 | #ifdef HAVE_LCD_COLOR |
111 | unsigned char cur_line = 0; | 109 | unsigned char cur_line = 0; |
112 | #endif | 110 | #endif |
@@ -115,7 +113,7 @@ void list_draw(struct screen *display, struct gui_synclist *list) | |||
115 | line_height = font_get(parent->font)->height; | 113 | line_height = font_get(parent->font)->height; |
116 | display->set_viewport(parent); | 114 | display->set_viewport(parent); |
117 | display->clear_viewport(); | 115 | display->clear_viewport(); |
118 | display->scroll_stop(&ui_vp[screen]); | 116 | display->scroll_stop(&list_text[screen]); |
119 | list_text[screen] = *parent; | 117 | list_text[screen] = *parent; |
120 | if ((show_title = draw_title(display, list))) | 118 | if ((show_title = draw_title(display, list))) |
121 | { | 119 | { |