diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-11 08:05:05 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-11 08:05:05 +0000 |
commit | f83d6eb145aab4646968e9a69bdd9c56e5a88926 (patch) | |
tree | 1cea65a9066cd6d7ef86c71d0c3db74a1efe6a4f /apps/plugins | |
parent | c2d2106fd76ae553a9f7b2418265209468cbb9e6 (diff) | |
download | rockbox-f83d6eb145aab4646968e9a69bdd9c56e5a88926.tar.gz rockbox-f83d6eb145aab4646968e9a69bdd9c56e5a88926.zip |
revert FS#6747 — y-margin reset in gui_list_draw, it introduced a nasty
scroll bug which isnt so simple to fix.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12719 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/solitaire.c | 2 | ||||
-rw-r--r-- | apps/plugins/viewer.c | 5 |
2 files changed, 7 insertions, 0 deletions
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 | ||