diff options
-rw-r--r-- | apps/gui/list.c | 6 | ||||
-rw-r--r-- | apps/gui/yesno.c | 2 | ||||
-rw-r--r-- | apps/screens.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/gui/list.c b/apps/gui/list.c index 7adb83eb97..288c18ab1c 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c | |||
@@ -483,13 +483,15 @@ void gui_synclist_set_color_callback(struct gui_synclist * lists, | |||
483 | static void gui_synclist_select_next_page(struct gui_synclist * lists, | 483 | static void gui_synclist_select_next_page(struct gui_synclist * lists, |
484 | enum screen_type screen) | 484 | enum screen_type screen) |
485 | { | 485 | { |
486 | gui_list_select_at_offset(lists, screens[screen].nb_lines); | 486 | int nb_lines = viewport_get_nb_lines(lists->parent[screen]); |
487 | gui_list_select_at_offset(lists, nb_lines); | ||
487 | } | 488 | } |
488 | 489 | ||
489 | static void gui_synclist_select_previous_page(struct gui_synclist * lists, | 490 | static void gui_synclist_select_previous_page(struct gui_synclist * lists, |
490 | enum screen_type screen) | 491 | enum screen_type screen) |
491 | { | 492 | { |
492 | gui_list_select_at_offset(lists, -screens[screen].nb_lines); | 493 | int nb_lines = viewport_get_nb_lines(lists->parent[screen]); |
494 | gui_list_select_at_offset(lists, -nb_lines); | ||
493 | } | 495 | } |
494 | 496 | ||
495 | void gui_synclist_limit_scroll(struct gui_synclist * lists, bool scroll) | 497 | void gui_synclist_limit_scroll(struct gui_synclist * lists, bool scroll) |
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c index 7433e16d71..43eccfb313 100644 --- a/apps/gui/yesno.c +++ b/apps/gui/yesno.c | |||
@@ -60,7 +60,6 @@ static void gui_yesno_draw(struct gui_yesno * yn) | |||
60 | int nb_lines, vp_lines, line_shift=0; | 60 | int nb_lines, vp_lines, line_shift=0; |
61 | 61 | ||
62 | display->set_viewport(vp); | 62 | display->set_viewport(vp); |
63 | display->stop_scroll(); | ||
64 | display->clear_viewport(); | 63 | display->clear_viewport(); |
65 | nb_lines = yn->main_message->nb_lines; | 64 | nb_lines = yn->main_message->nb_lines; |
66 | vp_lines = viewport_get_nb_lines(vp); | 65 | vp_lines = viewport_get_nb_lines(vp); |
@@ -100,7 +99,6 @@ static bool gui_yesno_draw_result(struct gui_yesno * yn, enum yesno_res result) | |||
100 | if(message==NULL) | 99 | if(message==NULL) |
101 | return false; | 100 | return false; |
102 | display->set_viewport(vp); | 101 | display->set_viewport(vp); |
103 | display->stop_scroll(); | ||
104 | display->clear_viewport(); | 102 | display->clear_viewport(); |
105 | put_message(yn->display, message, 0, viewport_get_nb_lines(vp)); | 103 | put_message(yn->display, message, 0, viewport_get_nb_lines(vp)); |
106 | display->update_viewport(); | 104 | display->update_viewport(); |
diff --git a/apps/screens.c b/apps/screens.c index fc5c0053ec..a0e8c9b399 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -56,6 +56,7 @@ | |||
56 | #include "list.h" | 56 | #include "list.h" |
57 | #include "yesno.h" | 57 | #include "yesno.h" |
58 | #include "backdrop.h" | 58 | #include "backdrop.h" |
59 | #include "viewport.h" | ||
59 | 60 | ||
60 | #ifdef HAVE_LCD_BITMAP | 61 | #ifdef HAVE_LCD_BITMAP |
61 | #include <bitmaps/usblogo.h> | 62 | #include <bitmaps/usblogo.h> |
@@ -546,7 +547,6 @@ bool set_time_screen(const char* title, struct tm *tm) | |||
546 | 547 | ||
547 | /* draw the screen */ | 548 | /* draw the screen */ |
548 | screens[s].set_viewport(&vp[s]); | 549 | screens[s].set_viewport(&vp[s]); |
549 | screens[s].stop_scroll(); | ||
550 | screens[s].clear_viewport(); | 550 | screens[s].clear_viewport(); |
551 | /* display the screen title */ | 551 | /* display the screen title */ |
552 | screens[s].puts_scroll(0, 0, title); | 552 | screens[s].puts_scroll(0, 0, title); |