summaryrefslogtreecommitdiffstats
path: root/apps/gui
diff options
context:
space:
mode:
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/bitmap/list-skinned.c4
-rw-r--r--apps/gui/bitmap/list.c10
-rw-r--r--apps/gui/charcell/list.c2
-rw-r--r--apps/gui/quickscreen.c4
-rw-r--r--apps/gui/skin_engine/skin_render.c5
-rw-r--r--apps/gui/splash.c2
-rw-r--r--apps/gui/usb_screen.c4
-rw-r--r--apps/gui/viewport.c2
-rw-r--r--apps/gui/wps.c6
-rw-r--r--apps/gui/yesno.c4
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,
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)))
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)
(void)lists;
FOR_NB_SCREENS(i)
{
- screens[i].stop_scroll();
+ screens[i].scroll_stop();
}
}
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
FOR_NB_SCREENS(i)
{
screens[i].set_viewport(NULL);
- screens[i].stop_scroll();
+ screens[i].scroll_stop();
viewportmanager_theme_enable(i, true, &parent[i]);
quickscreen_fix_viewports(qs, &screens[i], &parent[i], vps[i], &vp_icons[i]);
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
FOR_NB_SCREENS(i)
{ /* stop scrolling before exiting */
for (int j = 0; j < QUICKSCREEN_ITEM_COUNT; j++)
- screens[i].scroll_stop(&vps[i][j]);
+ screens[i].scroll_stop_viewport(&vps[i][j]);
viewportmanager_theme_undo(i, true);
}
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,
#endif
gwps->display->set_viewport(&skin_viewport->vp);
gwps->display->clear_viewport();
- gwps->display->scroll_stop(&skin_viewport->vp);
gwps->display->set_viewport(&info->skin_vp->vp);
skin_viewport->hidden_flags |= VP_DRAW_HIDDEN;
@@ -780,7 +779,7 @@ void skin_render_viewport(struct skin_element* viewport, struct gui_wps *gwps,
if (refresh_type && needs_update)
{
if (info.force_redraw)
- display->scroll_stop_line(&skin_viewport->vp, info.line_number);
+ display->scroll_stop_viewport_line(&skin_viewport->vp, info.line_number);
write_line(display, align, info.line_number,
info.line_scrolls, info.text_style);
}
@@ -969,7 +968,7 @@ void skin_render_playlistviewer(struct playlistviewer* viewer,
if (refresh_type && needs_update)
{
if (!info.force_redraw)
- display->scroll_stop_line(&skin_viewport->vp, info.line_number);
+ display->scroll_stop_viewport_line(&skin_viewport->vp, info.line_number);
write_line(display, align, info.line_number,
info.line_scrolls, info.text_style);
}
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)
* First boundaries, then the grey filling, then the black border and finally
* the text*/
- screen->stop_scroll();
+ screen->scroll_stop();
#ifdef HAVE_LCD_BITMAP
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,
disable = (parent->width < logo_width || parent->height < logo_height);
viewportmanager_theme_enable(screen->screen_type, !disable, parent);
screen->clear_display();
- screen->stop_scroll();
+ screen->scroll_stop();
*logo = *parent;
logo->x = parent->x + parent->width - logo_width;
@@ -308,7 +308,7 @@ void gui_usb_screen_run(bool early_usb)
vp = &usb_screen_vps_ar[i].parent;
#endif
if (vp)
- screens[i].scroll_stop(vp);
+ screens[i].scroll_stop_viewport(vp);
}
#ifdef USB_ENABLE_HID
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)
#if LCD_DEPTH > 1 || (defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1)
screens[screen].backdrop_show(NULL);
#endif
- screens[screen].stop_scroll();
+ screens[screen].scroll_stop();
skinlist_set_cfg(screen, NULL);
}
/* 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)
#endif
#if CONFIG_KEYPAD == PLAYER_PAD
FOR_NB_SCREENS(i)
- skin_get_gwps(WPS, i)->display->stop_scroll();
+ skin_get_gwps(WPS, i)->display->scroll_stop();
#endif
if (direction > 0)
status_set_ffmode(STATUS_FASTFORWARD);
@@ -639,7 +639,7 @@ static void gwps_leave_wps(void)
{
FOR_NB_SCREENS(i)
{
- skin_get_gwps(WPS, i)->display->stop_scroll();
+ skin_get_gwps(WPS, i)->display->scroll_stop();
#ifdef HAVE_BACKDROP_IMAGE
skin_backdrop_show(sb_get_backdrop(i));
#endif
@@ -668,7 +668,7 @@ static void gwps_enter_wps(void)
{
gwps = skin_get_gwps(WPS, i);
display = gwps->display;
- display->stop_scroll();
+ display->scroll_stop();
viewportmanager_theme_enable(i, skin_has_sbs(i, skin_get_gwps(WPS, i)->data), NULL);
/* 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,
#else
viewportmanager_theme_enable(i, true, yn[i].vp);
#endif
- screens[i].stop_scroll();
+ screens[i].scroll_stop();
gui_yesno_draw(&(yn[i]));
}
@@ -231,7 +231,7 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message,
FOR_NB_SCREENS(i)
{
- screens[i].scroll_stop(yn[i].vp);
+ screens[i].scroll_stop_viewport(yn[i].vp);
viewportmanager_theme_undo(i, true);
}