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 /apps/gui | |
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 'apps/gui')
-rw-r--r-- | apps/gui/bitmap/list-skinned.c | 4 | ||||
-rw-r--r-- | apps/gui/bitmap/list.c | 10 | ||||
-rw-r--r-- | apps/gui/charcell/list.c | 2 | ||||
-rw-r--r-- | apps/gui/quickscreen.c | 4 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_render.c | 5 | ||||
-rw-r--r-- | apps/gui/splash.c | 2 | ||||
-rw-r--r-- | apps/gui/usb_screen.c | 4 | ||||
-rw-r--r-- | apps/gui/viewport.c | 2 | ||||
-rw-r--r-- | apps/gui/wps.c | 6 | ||||
-rw-r--r-- | apps/gui/yesno.c | 4 |
10 files changed, 21 insertions, 22 deletions
diff --git a/apps/gui/bitmap/list-skinned.c b/apps/gui/bitmap/list-skinned.c index d0803b5dc8..d6b868ae26 100644 --- a/apps/gui/bitmap/list-skinned.c +++ b/apps/gui/bitmap/list-skinned.c | |||
@@ -54,7 +54,7 @@ void skinlist_set_cfg(enum screen_type screen, | |||
54 | if (listcfg[screen] != cfg) | 54 | if (listcfg[screen] != cfg) |
55 | { | 55 | { |
56 | if (listcfg[screen]) | 56 | if (listcfg[screen]) |
57 | screens[screen].scroll_stop(&listcfg[screen]->selected_item_vp.vp); | 57 | screens[screen].scroll_stop_viewport(&listcfg[screen]->selected_item_vp.vp); |
58 | listcfg[screen] = cfg; | 58 | listcfg[screen] = cfg; |
59 | current_list = NULL; | 59 | current_list = NULL; |
60 | current_column = -1; | 60 | current_column = -1; |
@@ -269,7 +269,7 @@ bool skinlist_draw(struct screen *display, struct gui_synclist *list) | |||
269 | /* force disableing scroll because it breaks later */ | 269 | /* force disableing scroll because it breaks later */ |
270 | if (!is_selected) | 270 | if (!is_selected) |
271 | { | 271 | { |
272 | display->scroll_stop(&skin_viewport->vp); | 272 | display->scroll_stop_viewport(&skin_viewport->vp); |
273 | skin_viewport->vp.x = original_x; | 273 | skin_viewport->vp.x = original_x; |
274 | skin_viewport->vp.y = original_y; | 274 | skin_viewport->vp.y = original_y; |
275 | } | 275 | } |
diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c index 191446e186..79eec60b26 100644 --- a/apps/gui/bitmap/list.c +++ b/apps/gui/bitmap/list.c | |||
@@ -61,9 +61,9 @@ void gui_synclist_scroll_stop(struct gui_synclist *lists) | |||
61 | { | 61 | { |
62 | FOR_NB_SCREENS(i) | 62 | FOR_NB_SCREENS(i) |
63 | { | 63 | { |
64 | screens[i].scroll_stop(&list_text[i]); | 64 | screens[i].scroll_stop_viewport(&list_text[i]); |
65 | screens[i].scroll_stop(&title_text[i]); | 65 | screens[i].scroll_stop_viewport(&title_text[i]); |
66 | screens[i].scroll_stop(lists->parent[i]); | 66 | screens[i].scroll_stop_viewport(lists->parent[i]); |
67 | } | 67 | } |
68 | } | 68 | } |
69 | 69 | ||
@@ -100,7 +100,7 @@ static bool draw_title(struct screen *display, struct gui_synclist *list) | |||
100 | 100 | ||
101 | if (sb_set_title_text(list->title, list->title_icon, screen)) | 101 | if (sb_set_title_text(list->title, list->title_icon, screen)) |
102 | return false; /* the sbs is handling the title */ | 102 | return false; /* the sbs is handling the title */ |
103 | display->scroll_stop(title_text_vp); | 103 | display->scroll_stop_viewport(title_text_vp); |
104 | if (!list_display_title(list, screen)) | 104 | if (!list_display_title(list, screen)) |
105 | return false; | 105 | return false; |
106 | *title_text_vp = *(list->parent[screen]); | 106 | *title_text_vp = *(list->parent[screen]); |
@@ -160,7 +160,7 @@ void list_draw(struct screen *display, struct gui_synclist *list) | |||
160 | line_height = parent->line_height; | 160 | line_height = parent->line_height; |
161 | display->set_viewport(parent); | 161 | display->set_viewport(parent); |
162 | display->clear_viewport(); | 162 | display->clear_viewport(); |
163 | display->scroll_stop(list_text_vp); | 163 | display->scroll_stop_viewport(list_text_vp); |
164 | *list_text_vp = *parent; | 164 | *list_text_vp = *parent; |
165 | list_text_vp->line_height = line_height; | 165 | list_text_vp->line_height = line_height; |
166 | if ((show_title = draw_title(display, list))) | 166 | if ((show_title = draw_title(display, list))) |
diff --git a/apps/gui/charcell/list.c b/apps/gui/charcell/list.c index 3d7f876adc..753b8ff853 100644 --- a/apps/gui/charcell/list.c +++ b/apps/gui/charcell/list.c | |||
@@ -43,7 +43,7 @@ void gui_synclist_scroll_stop(struct gui_synclist *lists) | |||
43 | (void)lists; | 43 | (void)lists; |
44 | FOR_NB_SCREENS(i) | 44 | FOR_NB_SCREENS(i) |
45 | { | 45 | { |
46 | screens[i].stop_scroll(); | 46 | screens[i].scroll_stop(); |
47 | } | 47 | } |
48 | } | 48 | } |
49 | 49 | ||
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c index 5c8a7705ae..64d938d8aa 100644 --- a/apps/gui/quickscreen.c +++ b/apps/gui/quickscreen.c | |||
@@ -323,7 +323,7 @@ static bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_ente | |||
323 | FOR_NB_SCREENS(i) | 323 | FOR_NB_SCREENS(i) |
324 | { | 324 | { |
325 | screens[i].set_viewport(NULL); | 325 | screens[i].set_viewport(NULL); |
326 | screens[i].stop_scroll(); | 326 | screens[i].scroll_stop(); |
327 | viewportmanager_theme_enable(i, true, &parent[i]); | 327 | viewportmanager_theme_enable(i, true, &parent[i]); |
328 | quickscreen_fix_viewports(qs, &screens[i], &parent[i], vps[i], &vp_icons[i]); | 328 | quickscreen_fix_viewports(qs, &screens[i], &parent[i], vps[i], &vp_icons[i]); |
329 | gui_quickscreen_draw(qs, &screens[i], &parent[i], vps[i], &vp_icons[i]); | 329 | gui_quickscreen_draw(qs, &screens[i], &parent[i], vps[i], &vp_icons[i]); |
@@ -368,7 +368,7 @@ static bool gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_ente | |||
368 | FOR_NB_SCREENS(i) | 368 | FOR_NB_SCREENS(i) |
369 | { /* stop scrolling before exiting */ | 369 | { /* stop scrolling before exiting */ |
370 | for (int j = 0; j < QUICKSCREEN_ITEM_COUNT; j++) | 370 | for (int j = 0; j < QUICKSCREEN_ITEM_COUNT; j++) |
371 | screens[i].scroll_stop(&vps[i][j]); | 371 | screens[i].scroll_stop_viewport(&vps[i][j]); |
372 | viewportmanager_theme_undo(i, true); | 372 | viewportmanager_theme_undo(i, true); |
373 | } | 373 | } |
374 | 374 | ||
diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c index d9424b993d..67f1f0f448 100644 --- a/apps/gui/skin_engine/skin_render.c +++ b/apps/gui/skin_engine/skin_render.c | |||
@@ -427,7 +427,6 @@ static void do_tags_in_hidden_conditional(struct skin_element* branch, | |||
427 | #endif | 427 | #endif |
428 | gwps->display->set_viewport(&skin_viewport->vp); | 428 | gwps->display->set_viewport(&skin_viewport->vp); |
429 | gwps->display->clear_viewport(); | 429 | gwps->display->clear_viewport(); |
430 | gwps->display->scroll_stop(&skin_viewport->vp); | ||
431 | gwps->display->set_viewport(&info->skin_vp->vp); | 430 | gwps->display->set_viewport(&info->skin_vp->vp); |
432 | skin_viewport->hidden_flags |= VP_DRAW_HIDDEN; | 431 | skin_viewport->hidden_flags |= VP_DRAW_HIDDEN; |
433 | 432 | ||
@@ -780,7 +779,7 @@ void skin_render_viewport(struct skin_element* viewport, struct gui_wps *gwps, | |||
780 | if (refresh_type && needs_update) | 779 | if (refresh_type && needs_update) |
781 | { | 780 | { |
782 | if (info.force_redraw) | 781 | if (info.force_redraw) |
783 | display->scroll_stop_line(&skin_viewport->vp, info.line_number); | 782 | display->scroll_stop_viewport_line(&skin_viewport->vp, info.line_number); |
784 | write_line(display, align, info.line_number, | 783 | write_line(display, align, info.line_number, |
785 | info.line_scrolls, info.text_style); | 784 | info.line_scrolls, info.text_style); |
786 | } | 785 | } |
@@ -969,7 +968,7 @@ void skin_render_playlistviewer(struct playlistviewer* viewer, | |||
969 | if (refresh_type && needs_update) | 968 | if (refresh_type && needs_update) |
970 | { | 969 | { |
971 | if (!info.force_redraw) | 970 | if (!info.force_redraw) |
972 | display->scroll_stop_line(&skin_viewport->vp, info.line_number); | 971 | display->scroll_stop_viewport_line(&skin_viewport->vp, info.line_number); |
973 | write_line(display, align, info.line_number, | 972 | write_line(display, align, info.line_number, |
974 | info.line_scrolls, info.text_style); | 973 | info.line_scrolls, info.text_style); |
975 | } | 974 | } |
diff --git a/apps/gui/splash.c b/apps/gui/splash.c index ad6625fec6..2608a2e02e 100644 --- a/apps/gui/splash.c +++ b/apps/gui/splash.c | |||
@@ -133,7 +133,7 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap) | |||
133 | * First boundaries, then the grey filling, then the black border and finally | 133 | * First boundaries, then the grey filling, then the black border and finally |
134 | * the text*/ | 134 | * the text*/ |
135 | 135 | ||
136 | screen->stop_scroll(); | 136 | screen->scroll_stop(); |
137 | 137 | ||
138 | #ifdef HAVE_LCD_BITMAP | 138 | #ifdef HAVE_LCD_BITMAP |
139 | 139 | ||
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c index a02516fefb..e5bc12960e 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c | |||
@@ -156,7 +156,7 @@ static void usb_screen_fix_viewports(struct screen *screen, | |||
156 | disable = (parent->width < logo_width || parent->height < logo_height); | 156 | disable = (parent->width < logo_width || parent->height < logo_height); |
157 | viewportmanager_theme_enable(screen->screen_type, !disable, parent); | 157 | viewportmanager_theme_enable(screen->screen_type, !disable, parent); |
158 | screen->clear_display(); | 158 | screen->clear_display(); |
159 | screen->stop_scroll(); | 159 | screen->scroll_stop(); |
160 | 160 | ||
161 | *logo = *parent; | 161 | *logo = *parent; |
162 | logo->x = parent->x + parent->width - logo_width; | 162 | logo->x = parent->x + parent->width - logo_width; |
@@ -308,7 +308,7 @@ void gui_usb_screen_run(bool early_usb) | |||
308 | vp = &usb_screen_vps_ar[i].parent; | 308 | vp = &usb_screen_vps_ar[i].parent; |
309 | #endif | 309 | #endif |
310 | if (vp) | 310 | if (vp) |
311 | screens[i].scroll_stop(vp); | 311 | screens[i].scroll_stop_viewport(vp); |
312 | } | 312 | } |
313 | #ifdef USB_ENABLE_HID | 313 | #ifdef USB_ENABLE_HID |
314 | if (global_settings.usb_keypad_mode != usb_keypad_mode) | 314 | if (global_settings.usb_keypad_mode != usb_keypad_mode) |
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index 760e13cff7..0b5441e02b 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c | |||
@@ -178,7 +178,7 @@ static void toggle_theme(enum screen_type screen, bool force) | |||
178 | #if LCD_DEPTH > 1 || (defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1) | 178 | #if LCD_DEPTH > 1 || (defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1) |
179 | screens[screen].backdrop_show(NULL); | 179 | screens[screen].backdrop_show(NULL); |
180 | #endif | 180 | #endif |
181 | screens[screen].stop_scroll(); | 181 | screens[screen].scroll_stop(); |
182 | skinlist_set_cfg(screen, NULL); | 182 | skinlist_set_cfg(screen, NULL); |
183 | } | 183 | } |
184 | /* let list initialize viewport in case viewport dimensions is changed. */ | 184 | /* let list initialize viewport in case viewport dimensions is changed. */ |
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index 726df6add4..b4c3f40e9f 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -358,7 +358,7 @@ bool ffwd_rew(int button) | |||
358 | #endif | 358 | #endif |
359 | #if CONFIG_KEYPAD == PLAYER_PAD | 359 | #if CONFIG_KEYPAD == PLAYER_PAD |
360 | FOR_NB_SCREENS(i) | 360 | FOR_NB_SCREENS(i) |
361 | skin_get_gwps(WPS, i)->display->stop_scroll(); | 361 | skin_get_gwps(WPS, i)->display->scroll_stop(); |
362 | #endif | 362 | #endif |
363 | if (direction > 0) | 363 | if (direction > 0) |
364 | status_set_ffmode(STATUS_FASTFORWARD); | 364 | status_set_ffmode(STATUS_FASTFORWARD); |
@@ -639,7 +639,7 @@ static void gwps_leave_wps(void) | |||
639 | { | 639 | { |
640 | FOR_NB_SCREENS(i) | 640 | FOR_NB_SCREENS(i) |
641 | { | 641 | { |
642 | skin_get_gwps(WPS, i)->display->stop_scroll(); | 642 | skin_get_gwps(WPS, i)->display->scroll_stop(); |
643 | #ifdef HAVE_BACKDROP_IMAGE | 643 | #ifdef HAVE_BACKDROP_IMAGE |
644 | skin_backdrop_show(sb_get_backdrop(i)); | 644 | skin_backdrop_show(sb_get_backdrop(i)); |
645 | #endif | 645 | #endif |
@@ -668,7 +668,7 @@ static void gwps_enter_wps(void) | |||
668 | { | 668 | { |
669 | gwps = skin_get_gwps(WPS, i); | 669 | gwps = skin_get_gwps(WPS, i); |
670 | display = gwps->display; | 670 | display = gwps->display; |
671 | display->stop_scroll(); | 671 | display->scroll_stop(); |
672 | viewportmanager_theme_enable(i, skin_has_sbs(i, skin_get_gwps(WPS, i)->data), NULL); | 672 | viewportmanager_theme_enable(i, skin_has_sbs(i, skin_get_gwps(WPS, i)->data), NULL); |
673 | 673 | ||
674 | /* Update the values in the first (default) viewport - in case the user | 674 | /* Update the values in the first (default) viewport - in case the user |
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c index 74e3ad05a7..b754d5e477 100644 --- a/apps/gui/yesno.c +++ b/apps/gui/yesno.c | |||
@@ -166,7 +166,7 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message, | |||
166 | #else | 166 | #else |
167 | viewportmanager_theme_enable(i, true, yn[i].vp); | 167 | viewportmanager_theme_enable(i, true, yn[i].vp); |
168 | #endif | 168 | #endif |
169 | screens[i].stop_scroll(); | 169 | screens[i].scroll_stop(); |
170 | gui_yesno_draw(&(yn[i])); | 170 | gui_yesno_draw(&(yn[i])); |
171 | } | 171 | } |
172 | 172 | ||
@@ -231,7 +231,7 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message, | |||
231 | 231 | ||
232 | FOR_NB_SCREENS(i) | 232 | FOR_NB_SCREENS(i) |
233 | { | 233 | { |
234 | screens[i].scroll_stop(yn[i].vp); | 234 | screens[i].scroll_stop_viewport(yn[i].vp); |
235 | viewportmanager_theme_undo(i, true); | 235 | viewportmanager_theme_undo(i, true); |
236 | } | 236 | } |
237 | 237 | ||