diff options
author | Marianne Arnold <pixelma@rockbox.org> | 2007-09-28 21:16:35 +0000 |
---|---|---|
committer | Marianne Arnold <pixelma@rockbox.org> | 2007-09-28 21:16:35 +0000 |
commit | 7cbc161d517eb9bfbd2a251d82f62b07c1752168 (patch) | |
tree | 9a11bb0a4ab2e67628d27f1b6d5d93f58064b07e /apps | |
parent | c0e34fad91d4b17e8d419a6cc9669c9d8b9b7537 (diff) | |
download | rockbox-7cbc161d517eb9bfbd2a251d82f62b07c1752168.tar.gz rockbox-7cbc161d517eb9bfbd2a251d82f62b07c1752168.zip |
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
Diffstat (limited to 'apps')
19 files changed, 31 insertions, 40 deletions
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 | |||
60 | jackpot_slots.30x420x1.bmp | 60 | jackpot_slots.30x420x1.bmp |
61 | 61 | ||
62 | /* Bubbles */ | 62 | /* Bubbles */ |
63 | #if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) | 63 | #ifdef HAVE_LCD_COLOR |
64 | bubbles_emblem.112x64x1.bmp | 64 | #if (LCD_WIDTH >= 320) && (LCD_HEIGHT >= 240) |
65 | #elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110) | 65 | bubbles_emblem.320x240x16.bmp |
66 | bubbles_emblem.138x110x2.bmp | 66 | bubbles_background.320x240x16.bmp |
67 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && !defined(HAVE_LCD_COLOR) | 67 | #elif (LCD_WIDTH >= 240) && (LCD_HEIGHT >= 320) |
68 | bubbles_emblem.160x128x2.bmp | 68 | bubbles_emblem.320x240x16.bmp |
69 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && defined(HAVE_LCD_COLOR) | 69 | bubbles_background.240x320x16.bmp |
70 | #elif (LCD_WIDTH >= 220) && (LCD_HEIGHT >= 176) | ||
71 | bubbles_emblem.220x176x16.bmp | ||
72 | bubbles_background.220x176x16.bmp | ||
73 | #elif (LCD_WIDTH >= 176) && (LCD_HEIGHT >= 220) | ||
74 | bubbles_emblem.220x176x16.bmp | ||
75 | bubbles_background.176x220x16.bmp | ||
76 | #elif (LCD_WIDTH >= 176) && (LCD_HEIGHT >= 132) | ||
70 | bubbles_emblem.160x128x16.bmp | 77 | bubbles_emblem.160x128x16.bmp |
71 | bubbles_left.160x128x16.bmp | 78 | bubbles_background.176x132x16.bmp |
72 | bubbles_right.160x128x16.bmp | 79 | #elif (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) |
73 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) | ||
74 | bubbles_emblem.160x128x16.bmp | 80 | bubbles_emblem.160x128x16.bmp |
75 | bubbles_left.160x128x16.bmp | 81 | bubbles_background.160x128x16.bmp |
76 | #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132) | 82 | #elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 128) |
77 | bubbles_emblem.160x128x16.bmp | 83 | bubbles_emblem.160x128x16.bmp |
78 | bubbles_left.176x132x16.bmp | 84 | bubbles_background.128x128x16.bmp |
79 | bubbles_right.176x132x16.bmp | 85 | #endif |
80 | #elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176) | 86 | #elif LCD_DEPTH <= 2 /* greyscale, mono */ |
81 | bubbles_emblem.220x176x16.bmp | 87 | #if (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) |
82 | bubbles_left.220x176x16.bmp | 88 | bubbles_emblem.160x128x2.bmp |
83 | bubbles_right.220x176x16.bmp | 89 | #elif (LCD_WIDTH >= 138) && (LCD_HEIGHT >= 110) |
84 | #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220) | 90 | bubbles_emblem.138x110x2.bmp |
85 | bubbles_emblem.220x176x16.bmp | 91 | #elif (LCD_WIDTH >= 112) && (LCD_HEIGHT >= 64) |
86 | bubbles_left.176x220x16.bmp | 92 | bubbles_emblem.112x64x1.bmp |
87 | #elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) | 93 | #endif |
88 | bubbles_emblem.320x240x16.bmp | ||
89 | bubbles_left.320x240x16.bmp | ||
90 | bubbles_right.320x240x16.bmp | ||
91 | #elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320) | ||
92 | bubbles_emblem.320x240x16.bmp | ||
93 | bubbles_left.240x320x16.bmp | ||
94 | #endif | 94 | #endif |
95 | 95 | ||
96 | /* ChessBox */ | 96 | /* ChessBox */ |
diff --git a/apps/plugins/bitmaps/native/bubbles_background.128x128x16.bmp b/apps/plugins/bitmaps/native/bubbles_background.128x128x16.bmp new file mode 100644 index 0000000000..38afb6ea75 --- /dev/null +++ b/apps/plugins/bitmaps/native/bubbles_background.128x128x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/bubbles_background.160x128x16.bmp b/apps/plugins/bitmaps/native/bubbles_background.160x128x16.bmp new file mode 100644 index 0000000000..a77b7b1909 --- /dev/null +++ b/apps/plugins/bitmaps/native/bubbles_background.160x128x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/bubbles_background.176x132x16.bmp b/apps/plugins/bitmaps/native/bubbles_background.176x132x16.bmp new file mode 100644 index 0000000000..d7a006b2fa --- /dev/null +++ b/apps/plugins/bitmaps/native/bubbles_background.176x132x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/bubbles_background.176x220x16.bmp b/apps/plugins/bitmaps/native/bubbles_background.176x220x16.bmp new file mode 100644 index 0000000000..1b20464185 --- /dev/null +++ b/apps/plugins/bitmaps/native/bubbles_background.176x220x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/bubbles_background.220x176x16.bmp b/apps/plugins/bitmaps/native/bubbles_background.220x176x16.bmp new file mode 100644 index 0000000000..957d0b93b5 --- /dev/null +++ b/apps/plugins/bitmaps/native/bubbles_background.220x176x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/bubbles_background.240x320x16.bmp b/apps/plugins/bitmaps/native/bubbles_background.240x320x16.bmp new file mode 100644 index 0000000000..3397b3f432 --- /dev/null +++ b/apps/plugins/bitmaps/native/bubbles_background.240x320x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/bubbles_background.320x240x16.bmp b/apps/plugins/bitmaps/native/bubbles_background.320x240x16.bmp new file mode 100644 index 0000000000..f19278b018 --- /dev/null +++ b/apps/plugins/bitmaps/native/bubbles_background.320x240x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/bubbles_left.160x128x16.bmp b/apps/plugins/bitmaps/native/bubbles_left.160x128x16.bmp deleted file mode 100644 index 15f78cfdf2..0000000000 --- a/apps/plugins/bitmaps/native/bubbles_left.160x128x16.bmp +++ /dev/null | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/bubbles_left.176x132x16.bmp b/apps/plugins/bitmaps/native/bubbles_left.176x132x16.bmp deleted file mode 100644 index dbad0543a3..0000000000 --- a/apps/plugins/bitmaps/native/bubbles_left.176x132x16.bmp +++ /dev/null | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/bubbles_left.176x220x16.bmp b/apps/plugins/bitmaps/native/bubbles_left.176x220x16.bmp deleted file mode 100755 index 7d66663a0a..0000000000 --- a/apps/plugins/bitmaps/native/bubbles_left.176x220x16.bmp +++ /dev/null | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/bubbles_left.220x176x16.bmp b/apps/plugins/bitmaps/native/bubbles_left.220x176x16.bmp deleted file mode 100644 index cbe38ca53c..0000000000 --- a/apps/plugins/bitmaps/native/bubbles_left.220x176x16.bmp +++ /dev/null | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/bubbles_left.240x320x16.bmp b/apps/plugins/bitmaps/native/bubbles_left.240x320x16.bmp deleted file mode 100644 index 6e4bb4533e..0000000000 --- a/apps/plugins/bitmaps/native/bubbles_left.240x320x16.bmp +++ /dev/null | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/bubbles_left.320x240x16.bmp b/apps/plugins/bitmaps/native/bubbles_left.320x240x16.bmp deleted file mode 100644 index 194bea0ff0..0000000000 --- a/apps/plugins/bitmaps/native/bubbles_left.320x240x16.bmp +++ /dev/null | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/bubbles_right.160x128x16.bmp b/apps/plugins/bitmaps/native/bubbles_right.160x128x16.bmp deleted file mode 100644 index d065365e82..0000000000 --- a/apps/plugins/bitmaps/native/bubbles_right.160x128x16.bmp +++ /dev/null | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/bubbles_right.176x132x16.bmp b/apps/plugins/bitmaps/native/bubbles_right.176x132x16.bmp deleted file mode 100644 index 1093c17b2b..0000000000 --- a/apps/plugins/bitmaps/native/bubbles_right.176x132x16.bmp +++ /dev/null | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/bubbles_right.220x176x16.bmp b/apps/plugins/bitmaps/native/bubbles_right.220x176x16.bmp deleted file mode 100644 index c0d8bef8ab..0000000000 --- a/apps/plugins/bitmaps/native/bubbles_right.220x176x16.bmp +++ /dev/null | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/bubbles_right.320x240x16.bmp b/apps/plugins/bitmaps/native/bubbles_right.320x240x16.bmp deleted file mode 100644 index 5872fdc8ec..0000000000 --- a/apps/plugins/bitmaps/native/bubbles_right.320x240x16.bmp +++ /dev/null | |||
Binary files differ | |||
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index 4d49c3fc14..812a88fb10 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -202,11 +202,7 @@ PLUGIN_HEADER | |||
202 | extern const fb_data bubbles_bubble[]; | 202 | extern const fb_data bubbles_bubble[]; |
203 | extern const fb_data bubbles_emblem[]; | 203 | extern const fb_data bubbles_emblem[]; |
204 | #ifdef HAVE_LCD_COLOR | 204 | #ifdef HAVE_LCD_COLOR |
205 | extern const fb_data bubbles_left[]; | 205 | extern const fb_data bubbles_background[]; |
206 | /* skip right border for square screens */ | ||
207 | #if (LCD_WIDTH > LCD_HEIGHT) | ||
208 | extern const fb_data bubbles_right[]; | ||
209 | #endif | ||
210 | #endif | 206 | #endif |
211 | 207 | ||
212 | /* global rockbox api */ | 208 | /* global rockbox api */ |
@@ -1418,14 +1414,9 @@ static void bubbles_drawboard(struct game_context* bb) { | |||
1418 | /* clear screen */ | 1414 | /* clear screen */ |
1419 | rb->lcd_clear_display(); | 1415 | rb->lcd_clear_display(); |
1420 | 1416 | ||
1421 | /* draw sidebars */ | 1417 | /* draw background */ |
1422 | #ifdef HAVE_LCD_COLOR | 1418 | #ifdef HAVE_LCD_COLOR |
1423 | rb->lcd_bitmap(bubbles_left, 0, 0, XOFS, LCD_HEIGHT); | 1419 | rb->lcd_bitmap(bubbles_background, 0, 0, LCD_WIDTH, LCD_HEIGHT); |
1424 | /* skip right border for square screens */ | ||
1425 | #if (LCD_WIDTH > LCD_HEIGHT) | ||
1426 | rb->lcd_bitmap(bubbles_right, XOFS-1+BB_WIDTH*BUBBLE_WIDTH, 0, | ||
1427 | LCD_WIDTH-(XOFS-1+BB_WIDTH*BUBBLE_WIDTH), LCD_HEIGHT); | ||
1428 | #endif | ||
1429 | #endif | 1420 | #endif |
1430 | 1421 | ||
1431 | /* display play board */ | 1422 | /* display play board */ |