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/bitmaps/native/SOURCES | 56 ++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'apps/plugins/bitmaps/native/SOURCES') diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index 55ad8392c3..5e66779abb 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES @@ -60,37 +60,37 @@ brickmania_break.176x132x16.bmp jackpot_slots.30x420x1.bmp /* Bubbles */ -#if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) -bubbles_emblem.112x64x1.bmp -#elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110) -bubbles_emblem.138x110x2.bmp -#elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && !defined(HAVE_LCD_COLOR) -bubbles_emblem.160x128x2.bmp -#elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && defined(HAVE_LCD_COLOR) +#ifdef HAVE_LCD_COLOR +#if (LCD_WIDTH >= 320) && (LCD_HEIGHT >= 240) +bubbles_emblem.320x240x16.bmp +bubbles_background.320x240x16.bmp +#elif (LCD_WIDTH >= 240) && (LCD_HEIGHT >= 320) +bubbles_emblem.320x240x16.bmp +bubbles_background.240x320x16.bmp +#elif (LCD_WIDTH >= 220) && (LCD_HEIGHT >= 176) +bubbles_emblem.220x176x16.bmp +bubbles_background.220x176x16.bmp +#elif (LCD_WIDTH >= 176) && (LCD_HEIGHT >= 220) +bubbles_emblem.220x176x16.bmp +bubbles_background.176x220x16.bmp +#elif (LCD_WIDTH >= 176) && (LCD_HEIGHT >= 132) bubbles_emblem.160x128x16.bmp -bubbles_left.160x128x16.bmp -bubbles_right.160x128x16.bmp -#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) +bubbles_background.176x132x16.bmp +#elif (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) bubbles_emblem.160x128x16.bmp -bubbles_left.160x128x16.bmp -#elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132) +bubbles_background.160x128x16.bmp +#elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 128) bubbles_emblem.160x128x16.bmp -bubbles_left.176x132x16.bmp -bubbles_right.176x132x16.bmp -#elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176) -bubbles_emblem.220x176x16.bmp -bubbles_left.220x176x16.bmp -bubbles_right.220x176x16.bmp -#elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220) -bubbles_emblem.220x176x16.bmp -bubbles_left.176x220x16.bmp -#elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) -bubbles_emblem.320x240x16.bmp -bubbles_left.320x240x16.bmp -bubbles_right.320x240x16.bmp -#elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320) -bubbles_emblem.320x240x16.bmp -bubbles_left.240x320x16.bmp +bubbles_background.128x128x16.bmp +#endif +#elif LCD_DEPTH <= 2 /* greyscale, mono */ +#if (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) +bubbles_emblem.160x128x2.bmp +#elif (LCD_WIDTH >= 138) && (LCD_HEIGHT >= 110) +bubbles_emblem.138x110x2.bmp +#elif (LCD_WIDTH >= 112) && (LCD_HEIGHT >= 64) +bubbles_emblem.112x64x1.bmp +#endif #endif /* ChessBox */ -- cgit v1.2.3