diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2011-01-10 07:32:29 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2011-01-10 07:32:29 +0000 |
commit | 9f4fdbd1a673de2897eede01616ca601d77eee21 (patch) | |
tree | 984affa20f855d7947d133a85902977891f41827 /apps/plugins | |
parent | fedd1f3bc1c617e72b400332c7acc59ccf337d4c (diff) | |
download | rockbox-9f4fdbd1a673de2897eede01616ca601d77eee21.tar.gz rockbox-9f4fdbd1a673de2897eede01616ca601d77eee21.zip |
Add backgrounds for 128x160 displays to bubbles and rockblox. Set the coordinates in the code.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29020 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/bitmaps/native/SOURCES | 5 | ||||
-rw-r--r-- | apps/plugins/bitmaps/native/bubbles_background.128x160x16.bmp | bin | 0 -> 61496 bytes | |||
-rw-r--r-- | apps/plugins/bitmaps/native/rockblox_background.128x160x16.bmp | bin | 0 -> 61496 bytes | |||
-rw-r--r-- | apps/plugins/bubbles.c | 14 | ||||
-rw-r--r-- | apps/plugins/rockblox.c | 20 |
5 files changed, 27 insertions, 12 deletions
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index 68cad04c79..65b1a3828e 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES | |||
@@ -139,6 +139,9 @@ bubbles_background.176x132x16.bmp | |||
139 | #elif (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) | 139 | #elif (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) |
140 | bubbles_emblem.160x128x16.bmp | 140 | bubbles_emblem.160x128x16.bmp |
141 | bubbles_background.160x128x16.bmp | 141 | bubbles_background.160x128x16.bmp |
142 | #elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 160) | ||
143 | bubbles_emblem.160x128x16.bmp | ||
144 | bubbles_background.128x160x16.bmp | ||
142 | #elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 128) | 145 | #elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 128) |
143 | bubbles_emblem.160x128x16.bmp | 146 | bubbles_emblem.160x128x16.bmp |
144 | bubbles_background.128x128x16.bmp | 147 | bubbles_background.128x128x16.bmp |
@@ -492,6 +495,8 @@ rockblox_background.176x220x16.bmp | |||
492 | rockblox_background.176x132x16.bmp | 495 | rockblox_background.176x132x16.bmp |
493 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) | 496 | #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) |
494 | rockblox_background.160x128x16.bmp | 497 | rockblox_background.160x128x16.bmp |
498 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 160) | ||
499 | rockblox_background.128x160x16.bmp | ||
495 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT >= 128) | 500 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT >= 128) |
496 | rockblox_background.128x128x16.bmp | 501 | rockblox_background.128x128x16.bmp |
497 | #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) | 502 | #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) |
diff --git a/apps/plugins/bitmaps/native/bubbles_background.128x160x16.bmp b/apps/plugins/bitmaps/native/bubbles_background.128x160x16.bmp new file mode 100644 index 0000000000..17e3e76888 --- /dev/null +++ b/apps/plugins/bitmaps/native/bubbles_background.128x160x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bitmaps/native/rockblox_background.128x160x16.bmp b/apps/plugins/bitmaps/native/rockblox_background.128x160x16.bmp new file mode 100644 index 0000000000..2155bd9903 --- /dev/null +++ b/apps/plugins/bitmaps/native/rockblox_background.128x160x16.bmp | |||
Binary files differ | |||
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index 57e29ede04..c7af502402 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -164,11 +164,23 @@ enum { | |||
164 | 164 | ||
165 | /* 12x12 bubbles (GoGear SA9200) */ | 165 | /* 12x12 bubbles (GoGear SA9200) */ |
166 | #elif (LCD_HEIGHT == 160) && (LCD_WIDTH == 128) | 166 | #elif (LCD_HEIGHT == 160) && (LCD_WIDTH == 128) |
167 | #define XOFS 33 | 167 | #define XOFS 16 |
168 | #define YOFS 32 | ||
168 | #define ROW_HEIGHT 10 | 169 | #define ROW_HEIGHT 10 |
169 | #define ROW_INDENT 6 | 170 | #define ROW_INDENT 6 |
170 | #define MAX_FPS 30 | 171 | #define MAX_FPS 30 |
171 | 172 | ||
173 | /* custom text positioning */ | ||
174 | #define LEVEL_TXT_X 2 | ||
175 | #define LEVEL_TXT_WIDTH 31 | ||
176 | #define LEVEL_TXT_Y 3 | ||
177 | #define SCORE_TXT_X 34 | ||
178 | #define SCORE_TXT_WIDTH 31 | ||
179 | #define SCORE_TXT_Y 3 | ||
180 | #define NEXT_BB_X 81 | ||
181 | #define NEXT_BB_WIDTH 31 | ||
182 | #define NEXT_BB_Y 2 | ||
183 | |||
172 | /* 10x10 bubbles (iPod Mini) */ | 184 | /* 10x10 bubbles (iPod Mini) */ |
173 | #elif (LCD_HEIGHT == 110) && (LCD_WIDTH == 138) | 185 | #elif (LCD_HEIGHT == 110) && (LCD_WIDTH == 138) |
174 | #define XOFS 33 | 186 | #define XOFS 33 |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 717aedab1f..6d5ef8023e 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -557,20 +557,18 @@ | |||
557 | #define LEVEL_Y 49 | 557 | #define LEVEL_Y 49 |
558 | #define LINES_Y 82 | 558 | #define LINES_Y 82 |
559 | 559 | ||
560 | /* NOTE: This is for the GoGear SA9200 and is only | ||
561 | temporary until I can get better coordinates! */ | ||
562 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 160) | 560 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 160) |
563 | 561 | ||
564 | #define BLOCK_WIDTH 6 | 562 | #define BLOCK_WIDTH 7 |
565 | #define BLOCK_HEIGHT 6 | 563 | #define BLOCK_HEIGHT 7 |
566 | #define BOARD_X 4 | 564 | #define BOARD_X 4 |
567 | #define BOARD_Y 3 | 565 | #define BOARD_Y 5 |
568 | #define PREVIEW_X 84 | 566 | #define PREVIEW_X 88 |
569 | #define PREVIEW_Y 100 | 567 | #define PREVIEW_Y 111 |
570 | #define LABEL_X 71 | 568 | #define LABEL_X 82 |
571 | #define SCORE_Y 17 | 569 | #define SCORE_Y (2+16) |
572 | #define LEVEL_Y 49 | 570 | #define LEVEL_Y (36+16) |
573 | #define LINES_Y 82 | 571 | #define LINES_Y (70+16) |
574 | 572 | ||
575 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) | 573 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) |
576 | 574 | ||