From 9f4fdbd1a673de2897eede01616ca601d77eee21 Mon Sep 17 00:00:00 2001
From: Michael Sevakis <jethead71@rockbox.org>
Date: Mon, 10 Jan 2011 07:32:29 +0000
Subject: 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
---
 apps/plugins/bitmaps/native/SOURCES                 |   5 +++++
 .../native/bubbles_background.128x160x16.bmp        | Bin 0 -> 61496 bytes
 .../native/rockblox_background.128x160x16.bmp       | Bin 0 -> 61496 bytes
 apps/plugins/bubbles.c                              |  14 +++++++++++++-
 apps/plugins/rockblox.c                             |  20 +++++++++-----------
 5 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 apps/plugins/bitmaps/native/bubbles_background.128x160x16.bmp
 create mode 100644 apps/plugins/bitmaps/native/rockblox_background.128x160x16.bmp

(limited to 'apps')

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
 #elif (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128)
 bubbles_emblem.160x128x16.bmp
 bubbles_background.160x128x16.bmp
+#elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 160)
+bubbles_emblem.160x128x16.bmp
+bubbles_background.128x160x16.bmp
 #elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 128)
 bubbles_emblem.160x128x16.bmp
 bubbles_background.128x128x16.bmp
@@ -492,6 +495,8 @@ rockblox_background.176x220x16.bmp
 rockblox_background.176x132x16.bmp
 #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128)
 rockblox_background.160x128x16.bmp
+#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 160)
+rockblox_background.128x160x16.bmp
 #elif (LCD_WIDTH == 128) && (LCD_HEIGHT >= 128)
 rockblox_background.128x128x16.bmp
 #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
Binary files /dev/null and b/apps/plugins/bitmaps/native/bubbles_background.128x160x16.bmp 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
Binary files /dev/null and b/apps/plugins/bitmaps/native/rockblox_background.128x160x16.bmp 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 {
 
 /* 12x12 bubbles (GoGear SA9200) */
 #elif (LCD_HEIGHT == 160) && (LCD_WIDTH == 128)
-#define XOFS          33
+#define XOFS          16
+#define YOFS          32
 #define ROW_HEIGHT    10
 #define ROW_INDENT     6
 #define MAX_FPS       30
 
+/* custom text positioning */
+#define LEVEL_TXT_X      2
+#define LEVEL_TXT_WIDTH 31
+#define LEVEL_TXT_Y      3
+#define SCORE_TXT_X     34
+#define SCORE_TXT_WIDTH 31
+#define SCORE_TXT_Y      3
+#define NEXT_BB_X       81
+#define NEXT_BB_WIDTH   31
+#define NEXT_BB_Y        2
+
 /* 10x10 bubbles (iPod Mini) */
 #elif (LCD_HEIGHT == 110) && (LCD_WIDTH == 138)
 #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 @@
 #define LEVEL_Y 49
 #define LINES_Y 82
 
-/* NOTE: This is for the GoGear SA9200 and is only
-   temporary until I can get better coordinates! */
 #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 160)
 
-#define BLOCK_WIDTH 6
-#define BLOCK_HEIGHT 6
+#define BLOCK_WIDTH 7
+#define BLOCK_HEIGHT 7
 #define BOARD_X 4
-#define BOARD_Y 3
-#define PREVIEW_X 84
-#define PREVIEW_Y 100
-#define LABEL_X 71
-#define SCORE_Y 17
-#define LEVEL_Y 49
-#define LINES_Y 82
+#define BOARD_Y 5
+#define PREVIEW_X 88
+#define PREVIEW_Y 111
+#define LABEL_X 82
+#define SCORE_Y (2+16)
+#define LEVEL_Y (36+16)
+#define LINES_Y (70+16)
 
 #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96)
 
-- 
cgit v1.2.3