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 | |
| 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
| -rw-r--r-- | apps/gui/list.c | 7 | ||||
| -rw-r--r-- | apps/plugins/solitaire.c | 2 | ||||
| -rw-r--r-- | apps/plugins/viewer.c | 5 | ||||
| -rw-r--r-- | docs/CREDITS | 1 |
4 files changed, 6 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) int lines; #ifdef HAVE_LCD_BITMAP int item_offset; - int old_margin = display->getxmargin(); + int old_xmargin = display->getxmargin(); + int old_ymargin = display->getymargin(); #endif gui_textarea_clear(display); @@ -406,7 +407,9 @@ static void gui_list_draw(struct gui_list * gui_list) gui_list->start_item, gui_list->start_item + lines, VERTICAL); } - screen_set_xmargin(display, old_margin); + + screen_set_xmargin(display, old_xmargin); + screen_set_ymargin(display, old_ymargin); #endif 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) break; case 3: - rb->lcd_setmargins(0, 0); if (solitaire_help() == HELP_USB) result = MENU_USB; break; @@ -657,7 +656,6 @@ int solitaire_menu(bool in_game) } } rb->menu_exit(m); - rb->lcd_setmargins(0, 0); return result; } 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) result = rb->menu_run(m); rb->menu_exit(m); #ifdef HAVE_LCD_BITMAP - rb->lcd_setmargins(0,0); - /* Show-scrollbar mode for current view-width mode */ if (!ONE_SCREEN_FITS_ALL()) if (prefs.scrollbar_mode == true) @@ -1328,9 +1326,6 @@ static void viewer_menu(void) break; } rb->menu_exit(m); -#ifdef HAVE_LCD_BITMAP - rb->lcd_setmargins(0,0); -#endif viewer_draw(col); } diff --git a/docs/CREDITS b/docs/CREDITS index 0581417ff6..5524bc83c8 100644 --- a/docs/CREDITS +++ b/docs/CREDITS @@ -277,3 +277,4 @@ Sean Morrisey Shay Green Nick Vanderweit Simon Menzel +Timo Horstschäfer |