diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/list.c | 5 | ||||
-rw-r--r-- | apps/plugins/solitaire.c | 2 | ||||
-rw-r--r-- | apps/plugins/viewer.c | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/apps/gui/list.c b/apps/gui/list.c index 5f1b016218..448c7da7f0 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c | |||
@@ -229,8 +229,7 @@ static void gui_list_draw(struct gui_list * gui_list) | |||
229 | int lines; | 229 | int lines; |
230 | #ifdef HAVE_LCD_BITMAP | 230 | #ifdef HAVE_LCD_BITMAP |
231 | int item_offset; | 231 | int item_offset; |
232 | int old_xmargin = display->getxmargin(); | 232 | int old_margin = display->getxmargin(); |
233 | int old_ymargin = display->getymargin(); | ||
234 | #endif | 233 | #endif |
235 | 234 | ||
236 | gui_textarea_clear(display); | 235 | gui_textarea_clear(display); |
@@ -408,7 +407,7 @@ static void gui_list_draw(struct gui_list * gui_list) | |||
408 | gui_list->start_item + lines, VERTICAL); | 407 | gui_list->start_item + lines, VERTICAL); |
409 | } | 408 | } |
410 | 409 | ||
411 | display->setmargins(old_xmargin, old_ymargin); | 410 | screen_set_xmargin(display, old_margin); |
412 | #endif | 411 | #endif |
413 | 412 | ||
414 | gui_textarea_update(display); | 413 | gui_textarea_update(display); |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 78998166ec..5283e40f4b 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -646,6 +646,7 @@ int solitaire_menu(bool in_game) | |||
646 | break; | 646 | break; |
647 | 647 | ||
648 | case 3: | 648 | case 3: |
649 | rb->lcd_setmargins(0, 0); | ||
649 | if (solitaire_help() == HELP_USB) | 650 | if (solitaire_help() == HELP_USB) |
650 | result = MENU_USB; | 651 | result = MENU_USB; |
651 | break; | 652 | break; |
@@ -656,6 +657,7 @@ int solitaire_menu(bool in_game) | |||
656 | } | 657 | } |
657 | } | 658 | } |
658 | rb->menu_exit(m); | 659 | rb->menu_exit(m); |
660 | rb->lcd_setmargins(0, 0); | ||
659 | return result; | 661 | return result; |
660 | } | 662 | } |
661 | 663 | ||
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index d63684b793..543b5c0d1d 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -1287,6 +1287,8 @@ static bool viewer_options_menu(void) | |||
1287 | result = rb->menu_run(m); | 1287 | result = rb->menu_run(m); |
1288 | rb->menu_exit(m); | 1288 | rb->menu_exit(m); |
1289 | #ifdef HAVE_LCD_BITMAP | 1289 | #ifdef HAVE_LCD_BITMAP |
1290 | rb->lcd_setmargins(0,0); | ||
1291 | |||
1290 | /* Show-scrollbar mode for current view-width mode */ | 1292 | /* Show-scrollbar mode for current view-width mode */ |
1291 | if (!ONE_SCREEN_FITS_ALL()) | 1293 | if (!ONE_SCREEN_FITS_ALL()) |
1292 | if (prefs.scrollbar_mode == true) | 1294 | if (prefs.scrollbar_mode == true) |
@@ -1326,6 +1328,9 @@ static void viewer_menu(void) | |||
1326 | break; | 1328 | break; |
1327 | } | 1329 | } |
1328 | rb->menu_exit(m); | 1330 | rb->menu_exit(m); |
1331 | #ifdef HAVE_LCD_BITMAP | ||
1332 | rb->lcd_setmargins(0,0); | ||
1333 | #endif | ||
1329 | viewer_draw(col); | 1334 | viewer_draw(col); |
1330 | } | 1335 | } |
1331 | 1336 | ||