tsiry-sandratraina.com / rockbox-zig
A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita audio rust zig deno mpris rockbox mpd
fork atom

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

Marianne Arnold 7cbc161d c0e34fad

+31 -40
+28 -28
apps/plugins/bitmaps/native/SOURCES
··· 60 60 jackpot_slots.30x420x1.bmp 61 61 62 62 /* Bubbles */ 63 - #if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) 64 - bubbles_emblem.112x64x1.bmp 65 - #elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110) 66 - bubbles_emblem.138x110x2.bmp 67 - #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && !defined(HAVE_LCD_COLOR) 68 - bubbles_emblem.160x128x2.bmp 69 - #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && defined(HAVE_LCD_COLOR) 63 + #ifdef HAVE_LCD_COLOR 64 + #if (LCD_WIDTH >= 320) && (LCD_HEIGHT >= 240) 65 + bubbles_emblem.320x240x16.bmp 66 + bubbles_background.320x240x16.bmp 67 + #elif (LCD_WIDTH >= 240) && (LCD_HEIGHT >= 320) 68 + bubbles_emblem.320x240x16.bmp 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 77 bubbles_emblem.160x128x16.bmp 71 - bubbles_left.160x128x16.bmp 72 - bubbles_right.160x128x16.bmp 73 - #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) 78 + bubbles_background.176x132x16.bmp 79 + #elif (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) 74 80 bubbles_emblem.160x128x16.bmp 75 - bubbles_left.160x128x16.bmp 76 - #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132) 81 + bubbles_background.160x128x16.bmp 82 + #elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 128) 77 83 bubbles_emblem.160x128x16.bmp 78 - bubbles_left.176x132x16.bmp 79 - bubbles_right.176x132x16.bmp 80 - #elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176) 81 - bubbles_emblem.220x176x16.bmp 82 - bubbles_left.220x176x16.bmp 83 - bubbles_right.220x176x16.bmp 84 - #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220) 85 - bubbles_emblem.220x176x16.bmp 86 - bubbles_left.176x220x16.bmp 87 - #elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) 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 84 + bubbles_background.128x128x16.bmp 85 + #endif 86 + #elif LCD_DEPTH <= 2 /* greyscale, mono */ 87 + #if (LCD_WIDTH >= 160) && (LCD_HEIGHT >= 128) 88 + bubbles_emblem.160x128x2.bmp 89 + #elif (LCD_WIDTH >= 138) && (LCD_HEIGHT >= 110) 90 + bubbles_emblem.138x110x2.bmp 91 + #elif (LCD_WIDTH >= 112) && (LCD_HEIGHT >= 64) 92 + bubbles_emblem.112x64x1.bmp 93 + #endif 94 94 #endif 95 95 96 96 /* ChessBox */
apps/plugins/bitmaps/native/bubbles_background.128x128x16.bmp

This is a binary file and will not be displayed.

apps/plugins/bitmaps/native/bubbles_background.160x128x16.bmp

This is a binary file and will not be displayed.

apps/plugins/bitmaps/native/bubbles_background.176x132x16.bmp

This is a binary file and will not be displayed.

apps/plugins/bitmaps/native/bubbles_background.176x220x16.bmp

This is a binary file and will not be displayed.

apps/plugins/bitmaps/native/bubbles_background.220x176x16.bmp

This is a binary file and will not be displayed.

apps/plugins/bitmaps/native/bubbles_background.240x320x16.bmp

This is a binary file and will not be displayed.

apps/plugins/bitmaps/native/bubbles_background.320x240x16.bmp

This is a binary file and will not be displayed.

apps/plugins/bitmaps/native/bubbles_left.160x128x16.bmp

This is a binary file and will not be displayed.

apps/plugins/bitmaps/native/bubbles_left.176x132x16.bmp

This is a binary file and will not be displayed.

apps/plugins/bitmaps/native/bubbles_left.176x220x16.bmp

This is a binary file and will not be displayed.

apps/plugins/bitmaps/native/bubbles_left.220x176x16.bmp

This is a binary file and will not be displayed.

apps/plugins/bitmaps/native/bubbles_left.240x320x16.bmp

This is a binary file and will not be displayed.

apps/plugins/bitmaps/native/bubbles_left.320x240x16.bmp

This is a binary file and will not be displayed.

apps/plugins/bitmaps/native/bubbles_right.160x128x16.bmp

This is a binary file and will not be displayed.

apps/plugins/bitmaps/native/bubbles_right.176x132x16.bmp

This is a binary file and will not be displayed.

apps/plugins/bitmaps/native/bubbles_right.220x176x16.bmp

This is a binary file and will not be displayed.

apps/plugins/bitmaps/native/bubbles_right.320x240x16.bmp

This is a binary file and will not be displayed.

+3 -12
apps/plugins/bubbles.c
··· 202 202 extern const fb_data bubbles_bubble[]; 203 203 extern const fb_data bubbles_emblem[]; 204 204 #ifdef HAVE_LCD_COLOR 205 - extern const fb_data bubbles_left[]; 206 - /* skip right border for square screens */ 207 - #if (LCD_WIDTH > LCD_HEIGHT) 208 - extern const fb_data bubbles_right[]; 209 - #endif 205 + extern const fb_data bubbles_background[]; 210 206 #endif 211 207 212 208 /* global rockbox api */ ··· 1418 1414 /* clear screen */ 1419 1415 rb->lcd_clear_display(); 1420 1416 1421 - /* draw sidebars */ 1417 + /* draw background */ 1422 1418 #ifdef HAVE_LCD_COLOR 1423 - rb->lcd_bitmap(bubbles_left, 0, 0, XOFS, 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 1419 + rb->lcd_bitmap(bubbles_background, 0, 0, LCD_WIDTH, LCD_HEIGHT); 1429 1420 #endif 1430 1421 1431 1422 /* display play board */