summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2006-03-21 11:31:53 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2006-03-21 11:31:53 +0000
commitab1019a1e8cc24d669f2ed3fb2640e5f4645f368 (patch)
tree0eddcfc14006d7c2eeb9d495aefd1ecc3a4ebb8a
parent7c7c03a2b9ecbd265d913c81b374e13eaa4f1078 (diff)
downloadrockbox-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.c13
-rw-r--r--apps/screens.c2
-rw-r--r--docs/CREDITS1
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)
#ifdef WPS_ID3
case WPS_ID3:
+#ifdef HAVE_LCD_COLOR
+ lcd_set_backdrop(gui_wps[SCREEN_MAIN].data->old_backdrop);
+#endif
browse_id3();
+#ifdef HAVE_LCD_COLOR
+ if (gui_wps[SCREEN_MAIN].data->has_backdrop)
+ lcd_set_backdrop(&wps_backdrop[0][0]);
+#endif
+#ifdef HAVE_LCD_BITMAP
+ FOR_NB_SCREENS(i)
+ {
+ gui_wps_set_margin(&gui_wps[i]);
+ }
+#endif
restore = true;
break;
#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)
char buf[64];
const struct mp3entry* id3 = audio_current_track();
#if defined(HAVE_LCD_BITMAP)
- const int y_margin = lcd_getymargin();
+ const int y_margin = global_settings.statusbar ? STATUSBAR_HEIGHT : 0;
const int line_height = font_get(FONT_UI)->height;
const int rows = (LCD_HEIGHT - y_margin) / line_height;
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
Christian Marg
Eli Sherer
Fredrik Öhrn
+Nicolas Pennequin