diff options
| author | Karl Kurbjun <kkurbjun@gmail.com> | 2009-04-11 22:22:44 +0000 |
|---|---|---|
| committer | Karl Kurbjun <kkurbjun@gmail.com> | 2009-04-11 22:22:44 +0000 |
| commit | 76328bbfda561dabe30312ed9d510cc7ed2ef063 (patch) | |
| tree | c4b38938db24e4952c23a6bfb265cc5e94991bf3 | |
| parent | ac0722da742426f36fda973a477e50ebb493ea21 (diff) | |
| download | rockbox-76328bbfda561dabe30312ed9d510cc7ed2ef063.zip rockbox-76328bbfda561dabe30312ed9d510cc7ed2ef063.tar.gz rockbox-76328bbfda561dabe30312ed9d510cc7ed2ef063.tar.bz2 rockbox-76328bbfda561dabe30312ed9d510cc7ed2ef063.tar.xz | |
Fix the scrollbar boundary checking to prevent the player from freezing on screens that are too small to show the list with the font selected. Correct the M:Robe remote screen height.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20690 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/gui/scrollbar.c | 8 | ||||
| -rw-r--r-- | firmware/export/config-mrobe500.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/apps/gui/scrollbar.c b/apps/gui/scrollbar.c index 0cb3602..8a0b885 100644 --- a/apps/gui/scrollbar.c +++ b/apps/gui/scrollbar.c @@ -92,6 +92,14 @@ void gui_scrollbar_draw(struct screen * screen, int x, int y, inner_y = y + 1; inner_wd = width - 2; inner_ht = height - 2; + + /* Boundary check to make sure that height is reasonable, otherwise nothing + * to do + */ + if(height<2 || width<2) + { + return; + } if (flags & HORIZONTAL) inner_len = inner_wd; diff --git a/firmware/export/config-mrobe500.h b/firmware/export/config-mrobe500.h index 4010b03..29c2670 100644 --- a/firmware/export/config-mrobe500.h +++ b/firmware/export/config-mrobe500.h @@ -91,7 +91,7 @@ /* remote LCD */ #define HAVE_REMOTE_LCD #define LCD_REMOTE_WIDTH 79 -#define LCD_REMOTE_HEIGHT 64 +#define LCD_REMOTE_HEIGHT 16 #define LCD_REMOTE_DEPTH 1 /* Remote display colours, for screenshots and sim (0xRRGGBB) */ |