diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2006-03-21 11:31:53 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2006-03-21 11:31:53 +0000 |
commit | ab1019a1e8cc24d669f2ed3fb2640e5f4645f368 (patch) | |
tree | 0eddcfc14006d7c2eeb9d495aefd1ecc3a4ebb8a | |
parent | 7c7c03a2b9ecbd265d913c81b374e13eaa4f1078 (diff) | |
download | rockbox-ab1019a1e8cc24d669f2ed3fb2640e5f4645f368.tar.gz rockbox-ab1019a1e8cc24d669f2ed3fb2640e5f4645f368.zip |
Patch #4843 by Nicolas Pennequin - Correct status bar and backdrop in ID3 info screen
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9156 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/gui/gwps.c | 13 | ||||
-rw-r--r-- | apps/screens.c | 2 | ||||
-rw-r--r-- | docs/CREDITS | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index 5ffdf4e33f..5c68ac40b0 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -709,7 +709,20 @@ long gui_wps_show(void) | |||
709 | 709 | ||
710 | #ifdef WPS_ID3 | 710 | #ifdef WPS_ID3 |
711 | case WPS_ID3: | 711 | case WPS_ID3: |
712 | #ifdef HAVE_LCD_COLOR | ||
713 | lcd_set_backdrop(gui_wps[SCREEN_MAIN].data->old_backdrop); | ||
714 | #endif | ||
712 | browse_id3(); | 715 | browse_id3(); |
716 | #ifdef HAVE_LCD_COLOR | ||
717 | if (gui_wps[SCREEN_MAIN].data->has_backdrop) | ||
718 | lcd_set_backdrop(&wps_backdrop[0][0]); | ||
719 | #endif | ||
720 | #ifdef HAVE_LCD_BITMAP | ||
721 | FOR_NB_SCREENS(i) | ||
722 | { | ||
723 | gui_wps_set_margin(&gui_wps[i]); | ||
724 | } | ||
725 | #endif | ||
713 | restore = true; | 726 | restore = true; |
714 | break; | 727 | break; |
715 | #endif | 728 | #endif |
diff --git a/apps/screens.c b/apps/screens.c index 4c71667a91..540cde5499 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -983,7 +983,7 @@ bool browse_id3(void) | |||
983 | char buf[64]; | 983 | char buf[64]; |
984 | const struct mp3entry* id3 = audio_current_track(); | 984 | const struct mp3entry* id3 = audio_current_track(); |
985 | #if defined(HAVE_LCD_BITMAP) | 985 | #if defined(HAVE_LCD_BITMAP) |
986 | const int y_margin = lcd_getymargin(); | 986 | const int y_margin = global_settings.statusbar ? STATUSBAR_HEIGHT : 0; |
987 | const int line_height = font_get(FONT_UI)->height; | 987 | const int line_height = font_get(FONT_UI)->height; |
988 | const int rows = (LCD_HEIGHT - y_margin) / line_height; | 988 | const int rows = (LCD_HEIGHT - y_margin) / line_height; |
989 | const bool show_scrollbar = global_settings.scrollbar | 989 | const bool show_scrollbar = global_settings.scrollbar |
diff --git a/docs/CREDITS b/docs/CREDITS index 24e3efa152..48665267fd 100644 --- a/docs/CREDITS +++ b/docs/CREDITS | |||
@@ -184,3 +184,4 @@ Matthias Mohr | |||
184 | Christian Marg | 184 | Christian Marg |
185 | Eli Sherer | 185 | Eli Sherer |
186 | Fredrik Öhrn | 186 | Fredrik Öhrn |
187 | Nicolas Pennequin | ||