From 1c5d0b41eebdb4f8c627b1a0e5f7b699f0b08fb8 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Wed, 3 Apr 2013 16:33:23 +0200 Subject: scroll_engine: Rename scroll_stop* functions to be more consistent with the lcd api. Change-Id: I8ada10b96bfb628cca0331689e8b936ae47c7e1c --- apps/gui/bitmap/list-skinned.c | 4 ++-- apps/gui/bitmap/list.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'apps/gui/bitmap') 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, if (listcfg[screen] != cfg) { if (listcfg[screen]) - screens[screen].scroll_stop(&listcfg[screen]->selected_item_vp.vp); + screens[screen].scroll_stop_viewport(&listcfg[screen]->selected_item_vp.vp); listcfg[screen] = cfg; current_list = NULL; current_column = -1; @@ -269,7 +269,7 @@ bool skinlist_draw(struct screen *display, struct gui_synclist *list) /* force disableing scroll because it breaks later */ if (!is_selected) { - display->scroll_stop(&skin_viewport->vp); + display->scroll_stop_viewport(&skin_viewport->vp); skin_viewport->vp.x = original_x; skin_viewport->vp.y = original_y; } 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) { FOR_NB_SCREENS(i) { - screens[i].scroll_stop(&list_text[i]); - screens[i].scroll_stop(&title_text[i]); - screens[i].scroll_stop(lists->parent[i]); + screens[i].scroll_stop_viewport(&list_text[i]); + screens[i].scroll_stop_viewport(&title_text[i]); + screens[i].scroll_stop_viewport(lists->parent[i]); } } @@ -100,7 +100,7 @@ static bool draw_title(struct screen *display, struct gui_synclist *list) if (sb_set_title_text(list->title, list->title_icon, screen)) return false; /* the sbs is handling the title */ - display->scroll_stop(title_text_vp); + display->scroll_stop_viewport(title_text_vp); if (!list_display_title(list, screen)) return false; *title_text_vp = *(list->parent[screen]); @@ -160,7 +160,7 @@ void list_draw(struct screen *display, struct gui_synclist *list) line_height = parent->line_height; display->set_viewport(parent); display->clear_viewport(); - display->scroll_stop(list_text_vp); + display->scroll_stop_viewport(list_text_vp); *list_text_vp = *parent; list_text_vp->line_height = line_height; if ((show_title = draw_title(display, list))) -- cgit v1.2.3