devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

bubbles: Fix various text positioning and line spacing issues

Browse source 
Affected a bunch of resolutions, tested with every resolution that had the game and ui simulator support.

Change-Id: I6abe9626f323d1f87f94589299ea6c847682e88b
This commit is contained in:
Hairo R. Carela 2025-08-19 22:43:22 -04:00
parent b0a4aae76e
commit e2f2ee88c8
1 changed files with 33 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

33
apps/plugins/bubbles.c
View file

@ -124,6 +124,17 @@ enum {
#define XOFS 144 #define XOFS 144
#define MAX_FPS 40 #define MAX_FPS 40
/* custom text positioning */
#define LEVEL_TXT_X 58
#define LEVEL_TXT_WIDTH 32
#define LEVEL_TXT_Y 8
#define SCORE_TXT_X 58
#define SCORE_TXT_WIDTH 32
#define SCORE_TXT_Y 62
#define NEXT_BB_X 58
#define NEXT_BB_WIDTH 32
#define NEXT_BB_Y 402
#elif (LCD_WIDTH == 480) && (LCD_HEIGHT == 640) #elif (LCD_WIDTH == 480) && (LCD_HEIGHT == 640)
#define XOFS 128 #define XOFS 128
#define MAX_FPS 40 #define MAX_FPS 40
@ -144,11 +155,27 @@ enum {
#define XOFS 72 #define XOFS 72
#define MAX_FPS 40 #define MAX_FPS 40
/* custom text positioning */
#define NEXT_BB_X 20
#define NEXT_BB_WIDTH 32
#define NEXT_BB_Y 200
/* 22x22 bubbles (Gigabeat, Onda VX747) */ /* 22x22 bubbles (Gigabeat, Onda VX747) */
#elif ((LCD_HEIGHT == 320) || (LCD_HEIGHT == 400)) && (LCD_WIDTH == 240) #elif ((LCD_HEIGHT == 320) || (LCD_HEIGHT == 400)) && (LCD_WIDTH == 240)
#define XOFS 64 #define XOFS 64
#define MAX_FPS 30 #define MAX_FPS 30
/* custom text positioning */
#define LEVEL_TXT_X 21
#define LEVEL_TXT_WIDTH 32
#define LEVEL_TXT_Y 2
#define SCORE_TXT_X 20
#define SCORE_TXT_WIDTH 32
#define SCORE_TXT_Y 29
#define NEXT_BB_X 20
#define NEXT_BB_WIDTH 32
#define NEXT_BB_Y 200
/* 16x16 bubbles (H300, iPod Color, HDD6330) */ /* 16x16 bubbles (H300, iPod Color, HDD6330) */
#elif (LCD_HEIGHT == 176) && (LCD_WIDTH == 220) #elif (LCD_HEIGHT == 176) && (LCD_WIDTH == 220)
#define XOFS 46 #define XOFS 46
@ -1471,8 +1498,14 @@ static void bubbles_drawboard(struct game_context* bb) {
/* clear screen */ /* clear screen */
rb->lcd_clear_display(); rb->lcd_clear_display();
#if ((LCD_HEIGHT >= 128) && (LCD_WIDTH <= 320)) || ((LCD_WIDTH == 132) && (LCD_HEIGHT == 80))
h = rb->font_get(FONT_SYSFIXED)->height + 1;
#elif (LCD_WIDTH == 640) && (LCD_HEIGHT == 480)
h = rb->font_get(FONT_SYSFIXED)->height + 6;
#else
int font = rb->screens[SCREEN_MAIN]->getuifont(); int font = rb->screens[SCREEN_MAIN]->getuifont();
h = rb->font_get(font)->height + 1; h = rb->font_get(font)->height + 1;
#endif
/* draw background */ /* draw background */
#ifdef HAVE_LCD_COLOR #ifdef HAVE_LCD_COLOR
rb->lcd_bitmap(bubbles_background, 0, 0, LCD_WIDTH, LCD_HEIGHT); rb->lcd_bitmap(bubbles_background, 0, 0, LCD_WIDTH, LCD_HEIGHT);