diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-10 12:43:21 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-10 12:43:21 +0000 |
commit | a990ff2920884ba6810dd222fd99ca627fd0e5d6 (patch) | |
tree | 66111a2bc5430bbc02c932eed694b22c40199b56 /apps | |
parent | 3631f11feab94aaa1f4da4d7ddb2ea3e746cb9ec (diff) | |
download | rockbox-a990ff2920884ba6810dd222fd99ca627fd0e5d6.tar.gz rockbox-a990ff2920884ba6810dd222fd99ca627fd0e5d6.zip |
Accept FS#6747 by Timo Horstschäfer
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12704 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/list.c | 7 | ||||
-rw-r--r-- | apps/plugins/solitaire.c | 2 | ||||
-rw-r--r-- | apps/plugins/viewer.c | 5 |
3 files changed, 5 insertions, 9 deletions
diff --git a/apps/gui/list.c b/apps/gui/list.c index 6a784b4998..296404fcc7 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c | |||
@@ -229,7 +229,8 @@ 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_margin = display->getxmargin(); | 232 | int old_xmargin = display->getxmargin(); |
233 | int old_ymargin = display->getymargin(); | ||
233 | #endif | 234 | #endif |
234 | 235 | ||
235 | gui_textarea_clear(display); | 236 | gui_textarea_clear(display); |
@@ -406,7 +407,9 @@ static void gui_list_draw(struct gui_list * gui_list) | |||
406 | gui_list->start_item, | 407 | gui_list->start_item, |
407 | gui_list->start_item + lines, VERTICAL); | 408 | gui_list->start_item + lines, VERTICAL); |
408 | } | 409 | } |
409 | screen_set_xmargin(display, old_margin); | 410 | |
411 | screen_set_xmargin(display, old_xmargin); | ||
412 | screen_set_ymargin(display, old_ymargin); | ||
410 | #endif | 413 | #endif |
411 | 414 | ||
412 | gui_textarea_update(display); | 415 | gui_textarea_update(display); |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 5283e40f4b..78998166ec 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -646,7 +646,6 @@ int solitaire_menu(bool in_game) | |||
646 | break; | 646 | break; |
647 | 647 | ||
648 | case 3: | 648 | case 3: |
649 | rb->lcd_setmargins(0, 0); | ||
650 | if (solitaire_help() == HELP_USB) | 649 | if (solitaire_help() == HELP_USB) |
651 | result = MENU_USB; | 650 | result = MENU_USB; |
652 | break; | 651 | break; |
@@ -657,7 +656,6 @@ int solitaire_menu(bool in_game) | |||
657 | } | 656 | } |
658 | } | 657 | } |
659 | rb->menu_exit(m); | 658 | rb->menu_exit(m); |
660 | rb->lcd_setmargins(0, 0); | ||
661 | return result; | 659 | return result; |
662 | } | 660 | } |
663 | 661 | ||
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index 543b5c0d1d..d63684b793 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -1287,8 +1287,6 @@ 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 | |||
1292 | /* Show-scrollbar mode for current view-width mode */ | 1290 | /* Show-scrollbar mode for current view-width mode */ |
1293 | if (!ONE_SCREEN_FITS_ALL()) | 1291 | if (!ONE_SCREEN_FITS_ALL()) |
1294 | if (prefs.scrollbar_mode == true) | 1292 | if (prefs.scrollbar_mode == true) |
@@ -1328,9 +1326,6 @@ static void viewer_menu(void) | |||
1328 | break; | 1326 | break; |
1329 | } | 1327 | } |
1330 | rb->menu_exit(m); | 1328 | rb->menu_exit(m); |
1331 | #ifdef HAVE_LCD_BITMAP | ||
1332 | rb->lcd_setmargins(0,0); | ||
1333 | #endif | ||
1334 | viewer_draw(col); | 1329 | viewer_draw(col); |
1335 | } | 1330 | } |
1336 | 1331 | ||