From f83d6eb145aab4646968e9a69bdd9c56e5a88926 Mon Sep 17 00:00:00 2001
From: Jonathan Gordon <rockbox@jdgordon.info>
Date: Sun, 11 Mar 2007 08:05:05 +0000
Subject: revert  FS#6747 — y-margin reset in gui_list_draw, it introduced a
 nasty scroll bug which isnt so simple to fix.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12719 a1c6a512-1295-4272-9138-f99709370657
---
 apps/plugins/solitaire.c | 2 ++
 apps/plugins/viewer.c    | 5 +++++
 2 files changed, 7 insertions(+)

(limited to 'apps/plugins')

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)
                 break;
 
             case 3:
+                rb->lcd_setmargins(0, 0);
                 if (solitaire_help() == HELP_USB)
                     result = MENU_USB;
                 break;
@@ -656,6 +657,7 @@ 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 d63684b793..543b5c0d1d 100644
--- a/apps/plugins/viewer.c
+++ b/apps/plugins/viewer.c
@@ -1287,6 +1287,8 @@ 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)
@@ -1326,6 +1328,9 @@ static void viewer_menu(void)
             break;
     }
     rb->menu_exit(m);
+#ifdef HAVE_LCD_BITMAP
+    rb->lcd_setmargins(0,0);
+#endif
     viewer_draw(col);
 }
 
-- 
cgit v1.2.3