summaryrefslogtreecommitdiffstats
path: root/apps/menu.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2008-04-23 11:07:40 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2008-04-23 11:07:40 +0000
commitfe9dca3d5b6156b85f1085ecc11ba8e3a1dcd2d7 (patch)
tree8e85e29dad56030c399377bcb429db6d935b544c /apps/menu.c
parent286d48f4ec99ec3f63687f623053e6dd01445863 (diff)
downloadrockbox-fe9dca3d5b6156b85f1085ecc11ba8e3a1dcd2d7.tar.gz
rockbox-fe9dca3d5b6156b85f1085ecc11ba8e3a1dcd2d7.tar.bz2
rockbox-fe9dca3d5b6156b85f1085ecc11ba8e3a1dcd2d7.zip
option_screen() now accepts a viewport
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17223 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menu.c')
-rw-r--r--apps/menu.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/menu.c b/apps/menu.c
index 1609aa0fb6..e29b9c4e76 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -304,7 +304,8 @@ void init_default_menu_viewports(struct viewport parent[NB_SCREENS], bool hide_b
#endif
}
-bool do_setting_from_menu(const struct menu_item_ex *temp)
+bool do_setting_from_menu(const struct menu_item_ex *temp,
+ struct viewport parent[NB_SCREENS])
{
int setting_id, oldval;
const struct settings_list *setting = find_setting(
@@ -351,7 +352,7 @@ bool do_setting_from_menu(const struct menu_item_ex *temp)
title = padded_title;
}
- option_screen((struct settings_list *)setting,
+ option_screen((struct settings_list *)setting, parent,
setting->flags&F_TEMPVAR, title);
if (var_type == F_T_INT || var_type == F_T_UINT)
{
@@ -585,7 +586,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
case MT_SETTING:
case MT_SETTING_W_TEXT:
{
- if (do_setting_from_menu(temp))
+ if (do_setting_from_menu(temp, menu_vp))
{
init_default_menu_viewports(menu_vp, hide_bars);
init_menu_lists(menu, &lists, selected, true,vps);