From 7cbc161d517eb9bfbd2a251d82f62b07c1752168 Mon Sep 17 00:00:00 2001 From: Marianne Arnold Date: Fri, 28 Sep 2007 21:16:35 +0000 Subject: Make bubbles use one background picture that is the size of the display instead of combining a 'left' and sometimes a 'right' bmp. This way it's clearer how the background is generated and adapting to new display sizes should be easier. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14893 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/bubbles.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'apps/plugins/bubbles.c') diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index 4d49c3f..812a88f 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c @@ -202,11 +202,7 @@ PLUGIN_HEADER extern const fb_data bubbles_bubble[]; extern const fb_data bubbles_emblem[]; #ifdef HAVE_LCD_COLOR -extern const fb_data bubbles_left[]; -/* skip right border for square screens */ -#if (LCD_WIDTH > LCD_HEIGHT) -extern const fb_data bubbles_right[]; -#endif +extern const fb_data bubbles_background[]; #endif /* global rockbox api */ @@ -1418,14 +1414,9 @@ static void bubbles_drawboard(struct game_context* bb) { /* clear screen */ rb->lcd_clear_display(); - /* draw sidebars */ + /* draw background */ #ifdef HAVE_LCD_COLOR - rb->lcd_bitmap(bubbles_left, 0, 0, XOFS, LCD_HEIGHT); - /* skip right border for square screens */ -#if (LCD_WIDTH > LCD_HEIGHT) - rb->lcd_bitmap(bubbles_right, XOFS-1+BB_WIDTH*BUBBLE_WIDTH, 0, - LCD_WIDTH-(XOFS-1+BB_WIDTH*BUBBLE_WIDTH), LCD_HEIGHT); -#endif + rb->lcd_bitmap(bubbles_background, 0, 0, LCD_WIDTH, LCD_HEIGHT); #endif /* display play board */ -- cgit v1.1