diff options
| author | Christian Soffke <christian.soffke@gmail.com> | 2023-01-01 07:48:42 +0100 |
|---|---|---|
| committer | Christian Soffke <christian.soffke@gmail.com> | 2023-01-05 23:45:41 -0500 |
| commit | 9bd524944598e3259e01269c9516de776063f645 (patch) | |
| tree | 3d1e692e2b4df1c5c67ebffb57605eff6f651dd0 | |
| parent | 9367ef1ed6b78d6bc078620009e383b3deae60b2 (diff) | |
| download | rockbox-9bd5249445.tar.gz rockbox-9bd5249445.zip | |
plugins: Credits: Fix logo sizes
Commit 1930ca8 repurposed the 'Logo' plugin's
logos, whose dimensions are different from those
used by show_logo, which was previously called
to display the logo.
Change-Id: I4d0c5f597dadfdadae244d895518bbcfefebb581
21 files changed, 54 insertions, 8 deletions
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index d0cc853f5b..814845dc5b 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES @@ -973,6 +973,45 @@ rockboxlogo.91x32x1.bmp #endif #endif +/* Credits logo */ +#if (LCD_DEPTH == 1) +#if (LCD_WIDTH == 160) +creditslogo.160x53x1.bmp +#elif (LCD_WIDTH == 128) +creditslogo.128x42x1.bmp +#else +creditslogo.112x30x1.bmp +#endif +#elif (LCD_WIDTH == 96) && (LCD_DEPTH >= 16) +creditslogo.96x30x16.bmp +#elif (LCD_WIDTH == 128) && (LCD_DEPTH == 2) +creditslogo.128x42x2.bmp +#elif (LCD_WIDTH == 128) && (LCD_DEPTH >= 16) +creditslogo.128x40x16.bmp +#elif (LCD_WIDTH == 132) && (LCD_DEPTH >= 16) +creditslogo.132x40x16.bmp +#elif (LCD_WIDTH == 138) && (LCD_DEPTH >= 2) +creditslogo.138x46x2.bmp +#elif (LCD_WIDTH == 160) && (LCD_DEPTH == 2) +creditslogo.160x53x2.bmp +#elif (LCD_WIDTH == 320) && (LCD_DEPTH == 2) +creditslogo.160x53x2.bmp +#elif (LCD_WIDTH == 160) && (LCD_DEPTH >= 16) +creditslogo.160x50x16.bmp +#elif (LCD_WIDTH == 176) && (LCD_DEPTH >= 16) +creditslogo.176x54x16.bmp +#elif (LCD_WIDTH == 220) && (LCD_DEPTH >= 16) +creditslogo.220x68x16.bmp +#elif (LCD_WIDTH == 240) && (LCD_DEPTH >= 16) +creditslogo.240x74x16.bmp +#elif (LCD_WIDTH >= 320) && (LCD_WIDTH < 480) && (LCD_DEPTH >= 16) +creditslogo.320x98x16.bmp +#elif (LCD_WIDTH >= 480) && (LCD_WIDTH < 640) && (LCD_DEPTH >= 16) +creditslogo.480x149x16.bmp +#elif (LCD_WIDTH >= 640) && (LCD_DEPTH >= 16) +creditslogo.640x198x16.bmp +#endif + /* Pitch detector */ /* The following preprocessor condition must match the condition */ /* for pitch detector from plugins/SOURCES */ diff --git a/apps/plugins/bitmaps/native/creditslogo.112x30x1.bmp b/apps/plugins/bitmaps/native/creditslogo.112x30x1.bmp Binary files differnew file mode 100644 index 0000000000..c414ffb27b --- /dev/null +++ b/apps/plugins/bitmaps/native/creditslogo.112x30x1.bmp diff --git a/apps/plugins/bitmaps/native/creditslogo.128x40x16.bmp b/apps/plugins/bitmaps/native/creditslogo.128x40x16.bmp Binary files differnew file mode 100644 index 0000000000..228dbddbd5 --- /dev/null +++ b/apps/plugins/bitmaps/native/creditslogo.128x40x16.bmp diff --git a/apps/plugins/bitmaps/native/creditslogo.128x42x1.bmp b/apps/plugins/bitmaps/native/creditslogo.128x42x1.bmp Binary files differnew file mode 100644 index 0000000000..27d8e5fc26 --- /dev/null +++ b/apps/plugins/bitmaps/native/creditslogo.128x42x1.bmp diff --git a/apps/plugins/bitmaps/native/creditslogo.128x42x2.bmp b/apps/plugins/bitmaps/native/creditslogo.128x42x2.bmp Binary files differnew file mode 100644 index 0000000000..fa12aa4bd7 --- /dev/null +++ b/apps/plugins/bitmaps/native/creditslogo.128x42x2.bmp diff --git a/apps/plugins/bitmaps/native/creditslogo.132x40x16.bmp b/apps/plugins/bitmaps/native/creditslogo.132x40x16.bmp Binary files differnew file mode 100644 index 0000000000..865a8ed59d --- /dev/null +++ b/apps/plugins/bitmaps/native/creditslogo.132x40x16.bmp diff --git a/apps/plugins/bitmaps/native/creditslogo.138x46x2.bmp b/apps/plugins/bitmaps/native/creditslogo.138x46x2.bmp Binary files differnew file mode 100644 index 0000000000..4b5d7beb16 --- /dev/null +++ b/apps/plugins/bitmaps/native/creditslogo.138x46x2.bmp diff --git a/apps/plugins/bitmaps/native/creditslogo.160x50x16.bmp b/apps/plugins/bitmaps/native/creditslogo.160x50x16.bmp Binary files differnew file mode 100644 index 0000000000..59e472def1 --- /dev/null +++ b/apps/plugins/bitmaps/native/creditslogo.160x50x16.bmp diff --git a/apps/plugins/bitmaps/native/creditslogo.160x53x1.bmp b/apps/plugins/bitmaps/native/creditslogo.160x53x1.bmp Binary files differnew file mode 100644 index 0000000000..7e34b23c6b --- /dev/null +++ b/apps/plugins/bitmaps/native/creditslogo.160x53x1.bmp diff --git a/apps/plugins/bitmaps/native/creditslogo.160x53x2.bmp b/apps/plugins/bitmaps/native/creditslogo.160x53x2.bmp Binary files differnew file mode 100644 index 0000000000..240cf10686 --- /dev/null +++ b/apps/plugins/bitmaps/native/creditslogo.160x53x2.bmp diff --git a/apps/plugins/bitmaps/native/creditslogo.176x54x16.bmp b/apps/plugins/bitmaps/native/creditslogo.176x54x16.bmp Binary files differnew file mode 100644 index 0000000000..bf43a65e42 --- /dev/null +++ b/apps/plugins/bitmaps/native/creditslogo.176x54x16.bmp diff --git a/apps/plugins/bitmaps/native/creditslogo.220x68x16.bmp b/apps/plugins/bitmaps/native/creditslogo.220x68x16.bmp Binary files differnew file mode 100644 index 0000000000..1dc68a09f2 --- /dev/null +++ b/apps/plugins/bitmaps/native/creditslogo.220x68x16.bmp diff --git a/apps/plugins/bitmaps/native/creditslogo.240x74x16.bmp b/apps/plugins/bitmaps/native/creditslogo.240x74x16.bmp Binary files differnew file mode 100644 index 0000000000..fd335b2fb8 --- /dev/null +++ b/apps/plugins/bitmaps/native/creditslogo.240x74x16.bmp diff --git a/apps/plugins/bitmaps/native/creditslogo.320x98x16.bmp b/apps/plugins/bitmaps/native/creditslogo.320x98x16.bmp Binary files differnew file mode 100644 index 0000000000..26dcac89c3 --- /dev/null +++ b/apps/plugins/bitmaps/native/creditslogo.320x98x16.bmp diff --git a/apps/plugins/bitmaps/native/creditslogo.480x149x16.bmp b/apps/plugins/bitmaps/native/creditslogo.480x149x16.bmp Binary files differnew file mode 100644 index 0000000000..c73d9374e4 --- /dev/null +++ b/apps/plugins/bitmaps/native/creditslogo.480x149x16.bmp diff --git a/apps/plugins/bitmaps/native/creditslogo.640x198x16.bmp b/apps/plugins/bitmaps/native/creditslogo.640x198x16.bmp Binary files differnew file mode 100644 index 0000000000..ec6a16da5d --- /dev/null +++ b/apps/plugins/bitmaps/native/creditslogo.640x198x16.bmp diff --git a/apps/plugins/bitmaps/native/creditslogo.96x30x16.bmp b/apps/plugins/bitmaps/native/creditslogo.96x30x16.bmp Binary files differnew file mode 100644 index 0000000000..e032ebae34 --- /dev/null +++ b/apps/plugins/bitmaps/native/creditslogo.96x30x16.bmp diff --git a/apps/plugins/bitmaps/remote_native/SOURCES b/apps/plugins/bitmaps/remote_native/SOURCES index b3cc2157ff..78cfd78212 100644 --- a/apps/plugins/bitmaps/remote_native/SOURCES +++ b/apps/plugins/bitmaps/remote_native/SOURCES @@ -22,3 +22,10 @@ remote_rockboxlogo.91x32x1.bmp #elif (LCD_REMOTE_DEPTH == 2) remote_rockboxlogo.91x32x2.bmp #endif + +*/ Credits logo */ +#if (LCD_REMOTE_DEPTH == 1) +remote_creditslogo.128x42x1.bmp +#elif (LCD_REMOTE_DEPTH == 2) +remote_creditslogo.128x42x2.bmp +#endif diff --git a/apps/plugins/bitmaps/remote_native/remote_creditslogo.128x42x1.bmp b/apps/plugins/bitmaps/remote_native/remote_creditslogo.128x42x1.bmp Binary files differnew file mode 100644 index 0000000000..27d8e5fc26 --- /dev/null +++ b/apps/plugins/bitmaps/remote_native/remote_creditslogo.128x42x1.bmp diff --git a/apps/plugins/bitmaps/remote_native/remote_creditslogo.128x42x2.bmp b/apps/plugins/bitmaps/remote_native/remote_creditslogo.128x42x2.bmp Binary files differnew file mode 100644 index 0000000000..fa12aa4bd7 --- /dev/null +++ b/apps/plugins/bitmaps/remote_native/remote_creditslogo.128x42x2.bmp diff --git a/apps/plugins/credits.c b/apps/plugins/credits.c index 86ca0ff4ab..f4716651fd 100644 --- a/apps/plugins/credits.c +++ b/apps/plugins/credits.c @@ -24,16 +24,16 @@ #ifdef HAVE_REMOTE_LCD #define REMOTE_WIDTH LCD_REMOTE_WIDTH #define REMOTE_HEIGHT LCD_REMOTE_HEIGHT -#include "pluginbitmaps/remote_rockboxlogo.h" -#define REMOTE_LOGO_WIDTH BMPWIDTH_remote_rockboxlogo -#define REMOTE_LOGO_HEIGHT BMPHEIGHT_remote_rockboxlogo -#define REMOTE_LOGO (const fb_remote_data*)remote_rockboxlogo +#include "pluginbitmaps/remote_creditslogo.h" +#define REMOTE_LOGO_WIDTH BMPWIDTH_remote_creditslogo +#define REMOTE_LOGO_HEIGHT BMPHEIGHT_remote_creditslogo +#define REMOTE_LOGO (const fb_remote_data*)remote_creditslogo #endif /* HAVE_REMOTE_LCD */ -#define LOGO (const fb_data*)rockboxlogo -#include "pluginbitmaps/rockboxlogo.h" -#define LOGO_WIDTH BMPWIDTH_rockboxlogo -#define LOGO_HEIGHT BMPHEIGHT_rockboxlogo +#define LOGO (const fb_data*)creditslogo +#include "pluginbitmaps/creditslogo.h" +#define LOGO_WIDTH BMPWIDTH_creditslogo +#define LOGO_HEIGHT BMPHEIGHT_creditslogo static const char* const credits[] = { #include "credits.raw" /* generated list of names from docs/CREDITS */ |
