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
This commit is contained in:
parent
c2d2106fd7
commit
f83d6eb145
3 changed files with 9 additions and 3 deletions
|
@ -229,8 +229,7 @@ static void gui_list_draw(struct gui_list * gui_list)
|
|||
int lines;
|
||||
#ifdef HAVE_LCD_BITMAP
|
||||
int item_offset;
|
||||
int old_xmargin = display->getxmargin();
|
||||
int old_ymargin = display->getymargin();
|
||||
int old_margin = display->getxmargin();
|
||||
#endif
|
||||
|
||||
gui_textarea_clear(display);
|
||||
|
@ -408,7 +407,7 @@ static void gui_list_draw(struct gui_list * gui_list)
|
|||
gui_list->start_item + lines, VERTICAL);
|
||||
}
|
||||
|
||||
display->setmargins(old_xmargin, old_ymargin);
|
||||
screen_set_xmargin(display, old_margin);
|
||||
#endif
|
||||
|
||||
gui_textarea_update(display);
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue