diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2009-12-09 07:25:46 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2009-12-09 07:25:46 +0000 |
commit | b2eb44ce0eb24632a46b0ea8c8c46a8f2ba35e24 (patch) | |
tree | ff3c0e14e9a53c08749ee1f233a5b1e887d3561a /apps/menu.c | |
parent | 85aad9b3972208b0e34ba0241ebb5314118ae05e (diff) | |
download | rockbox-b2eb44ce0eb24632a46b0ea8c8c46a8f2ba35e24.tar.gz rockbox-b2eb44ce0eb24632a46b0ea8c8c46a8f2ba35e24.zip |
FS#10824 - viewport/statusbar API rework.
Hopefully the only user visible changes are:
- fm and recording screens go by the statusbar setting (sbs or inbuilt)
- plugins go back to using the theme as they should for menus and lists
- splash screens might get cut a bit... entirely theme and splash dependant.. if there is a problematic one we can look at it later.
- hopefully nothing more than very minor screen flickerings... let me know exactly where they are so they can be fixed
New GUI screen rules:
* Screens assume that the theme (sbs+ui viewport+ maybe background image) are always enabled. They may be disabled on a per display basis, but MUST be re-enabled on exit
* Screens must not be coded in a way that requires a statusbar of any type.. the inbuilt bar will be removed shortly.
ALWAYS RESPECT THE USERS SETTINGS unless the screen requires the full display to fit.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23904 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menu.c')
-rw-r--r-- | apps/menu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/menu.c b/apps/menu.c index 1c2df9294c..536b14b7d1 100644 --- a/apps/menu.c +++ b/apps/menu.c | |||
@@ -343,8 +343,8 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected, | |||
343 | const struct menu_item_ex *temp, *menu; | 343 | const struct menu_item_ex *temp, *menu; |
344 | int ret = 0, i; | 344 | int ret = 0, i; |
345 | bool redraw_lists; | 345 | bool redraw_lists; |
346 | int oldbars = viewportmanager_get_statusbar(); | 346 | FOR_NB_SCREENS(i) |
347 | viewportmanager_set_statusbar(hide_bars ? VP_SB_HIDE_ALL : oldbars); | 347 | viewportmanager_theme_enable(i, true/*!hide_bars*/, NULL); |
348 | 348 | ||
349 | const struct menu_item_ex *menu_stack[MAX_MENUS]; | 349 | const struct menu_item_ex *menu_stack[MAX_MENUS]; |
350 | int menu_stack_selected_item[MAX_MENUS]; | 350 | int menu_stack_selected_item[MAX_MENUS]; |
@@ -686,7 +686,8 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected, | |||
686 | *start_selected = get_menu_selection( | 686 | *start_selected = get_menu_selection( |
687 | gui_synclist_get_sel_pos(&lists), menu); | 687 | gui_synclist_get_sel_pos(&lists), menu); |
688 | } | 688 | } |
689 | viewportmanager_set_statusbar(oldbars); | 689 | FOR_NB_SCREENS(i) |
690 | viewportmanager_theme_undo(i); | ||
690 | return ret; | 691 | return ret; |
691 | } | 692 | } |
692 | 693 | ||