diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-11-16 21:09:23 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-11-16 21:09:23 +0000 |
commit | 5b2cba17aa95ececfdb6a498540de4dfa215e920 (patch) | |
tree | 3574eab7dc84f588268b72f6db56744fcc4d0e64 /apps/gui | |
parent | 15046f99b3840c07bdd9d52e7014c6e775267c55 (diff) | |
download | rockbox-5b2cba17aa95ececfdb6a498540de4dfa215e920.tar.gz rockbox-5b2cba17aa95ececfdb6a498540de4dfa215e920.zip |
Changed the LCD_COLOR pixel value format to packed RGB (unsigned int). Now all LCDs with depth > 1 use the same datatype. Added macros for easy pixel value definition.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7912 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/splash.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/apps/gui/splash.c b/apps/gui/splash.c index fc15294211..8d69068d3b 100644 --- a/apps/gui/splash.c +++ b/apps/gui/splash.c | |||
@@ -127,13 +127,8 @@ void internal_splash(struct screen * screen, | |||
127 | int xx = (screen->width-maxw)/2 - 2; | 127 | int xx = (screen->width-maxw)/2 - 2; |
128 | /* The new graphics routines handle clipping, so no need to check */ | 128 | /* The new graphics routines handle clipping, so no need to check */ |
129 | #if LCD_DEPTH > 1 | 129 | #if LCD_DEPTH > 1 |
130 | #ifdef HAVE_LCD_COLOR | ||
131 | screen->set_background((struct rgb){LCD_MAX_RED-1, LCD_MAX_GREEN-1, | ||
132 | LCD_MAX_BLUE-1}); | ||
133 | #else | ||
134 | if(screen->depth>1) | 130 | if(screen->depth>1) |
135 | screen->set_background(LCD_MAX_LEVEL-1); | 131 | screen->set_background(LCD_LIGHTGRAY); |
136 | #endif | ||
137 | #endif | 132 | #endif |
138 | screen->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); | 133 | screen->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); |
139 | screen->fillrect(xx, y-2, maxw+4, screen->height-y*2+4); | 134 | screen->fillrect(xx, y-2, maxw+4, screen->height-y*2+4); |
@@ -183,7 +178,7 @@ void internal_splash(struct screen * screen, | |||
183 | 178 | ||
184 | #if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH > 1) | 179 | #if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH > 1) |
185 | if(screen->depth > 1) | 180 | if(screen->depth > 1) |
186 | screen->set_background(LCD_WHITE); | 181 | screen->set_background(LCD_DEFAULT_BG); |
187 | #endif | 182 | #endif |
188 | #if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR) | 183 | #if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR) |
189 | screen->update(); | 184 | screen->update(); |