Accept the last patch FS#10797 with a few changes by me (fixing side effects and adding the new backdrop_hide() to the multi screen api). It changes the hide_bars parameter to mean hide_theme.

This makes plugins show the menu backdrop in their backdrop so that they don't look like crap if you have an sbs and look more integrated. I've test about all plugins and all work fine.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24335 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 7 insertions, 7 deletions

diff --git a/apps/menu.c b/apps/menu.c
index 88f0f3c529..eb29b43f3b 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -335,7 +335,7 @@ void do_setting_from_menu(const struct menu_item_ex *temp,
 
 /* display a menu */
 int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
-            struct viewport parent[NB_SCREENS], bool hide_bars)
+            struct viewport parent[NB_SCREENS], bool hide_theme)
 {
     int selected = start_selected? *start_selected : 0;
     int action;
@@ -344,7 +344,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
     int ret = 0, i;
     bool redraw_lists;
     FOR_NB_SCREENS(i)
-        viewportmanager_theme_enable(i, !hide_bars, NULL);
+        viewportmanager_theme_enable(i, !hide_theme, NULL);
     
     const struct menu_item_ex *menu_stack[MAX_MENUS];
     int menu_stack_selected_item[MAX_MENUS];
@@ -363,7 +363,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
         menu = &main_menu_;
     else menu = start_menu;
 
-    /* if hide_bars is true, assume parent has been fixed before passed into
+    /* if hide_theme is true, assume parent has been fixed before passed into
      * this function, e.g. with viewport_set_defaults(parent, screen) */
     init_menu_lists(menu, &lists, selected, true, parent);
     vps = *(lists.parent);
@@ -373,7 +373,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
     
 
 #ifdef HAVE_BUTTONBAR
-    if (!hide_bars)
+    if (!hide_theme)
     {
         gui_buttonbar_set(&buttonbar, "<<<", "", "");
         gui_buttonbar_draw(&buttonbar);
@@ -382,7 +382,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
     while (!done)
     {
         redraw_lists = false;
-        if (!hide_bars)
+        if (!hide_theme)
         {
 #ifdef HAVE_BUTTONBAR
             gui_buttonbar_draw(&buttonbar);
@@ -551,7 +551,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
                 screens[i].scroll_stop(&vps[i]);
             }
 #ifdef HAVE_BUTTONBAR
-            if (!hide_bars)
+            if (!hide_theme)
             {
                 gui_buttonbar_unset(&buttonbar);
                 gui_buttonbar_draw(&buttonbar);
@@ -653,7 +653,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
                 break;
             }
 #ifdef HAVE_BUTTONBAR
-            if (!hide_bars)
+            if (!hide_theme)
             {
                 gui_buttonbar_set(&buttonbar, "<<<", "", "");
                 gui_buttonbar_draw(&buttonbar);