Fix some wierdness with the debug menus...

Set the current viewport back to NULL after the list is finished drawing, Screens 
should be setting it before they start drawing so this probably only effects the debug menus.
Also change how the statusbars are handled there to make things easier. (this change also forces the bars back on (if enabled) in the simple list widget.. hopefully this doesnt cause problems later)


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

2 files changed, 5 insertions, 7 deletions

diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c
index 074f72a179..6e1876912e 100644
--- a/apps/gui/bitmap/list.c
+++ b/apps/gui/bitmap/list.c
@@ -280,6 +280,7 @@ void list_draw(struct screen *display, struct gui_synclist *list)
     }
     display->set_viewport(parent);
     display->update_viewport();
+    display->set_viewport(NULL);
 }
 
 
diff --git a/apps/gui/list.c b/apps/gui/list.c
index 04bd7e4c3f..2107d3a593 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -844,20 +844,16 @@ static char* simplelist_static_getname(int item,
 bool simplelist_show_list(struct simplelist_info *info)
 {
     struct gui_synclist lists;
-    struct viewport vp[NB_SCREENS];
-    int action, old_line_count = simplelist_line_count,i;
+    int action, old_line_count = simplelist_line_count;
+    bool oldbars = viewportmanager_set_statusbar(true);
     char* (*getname)(int item, void * data, char *buffer, size_t buffer_len);
     int wrap = LIST_WRAP_UNLESS_HELD;
     if (info->get_name)
         getname = info->get_name;
     else
         getname = simplelist_static_getname;
-    FOR_NB_SCREENS(i)
-    {
-        viewport_set_defaults(&vp[i], i);
-    }
     gui_synclist_init(&lists, getname,  info->callback_data, 
-                      info->scroll_all, info->selection_size, vp);
+                      info->scroll_all, info->selection_size, NULL);
     
     if (info->title)
         gui_synclist_set_title(&lists, info->title, NOICON);
@@ -929,6 +925,7 @@ bool simplelist_show_list(struct simplelist_info *info)
             return true;
     }
     talk_shutup();
+    viewportmanager_set_statusbar(oldbars);
     return false;
 }