summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2006-09-11 12:53:46 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2006-09-11 12:53:46 +0000
commit7343863a2163a00a14725eb9420e7fda5707fef4 (patch)
treefb5c337477ba74aa7ba7fb9af2bbb7c4777cd2fc /apps
parentc4379c533c0da1544f88ba766521a20a2f67ae14 (diff)
downloadrockbox-7343863a2163a00a14725eb9420e7fda5707fef4.tar.gz
rockbox-7343863a2163a00a14725eb9420e7fda5707fef4.tar.bz2
rockbox-7343863a2163a00a14725eb9420e7fda5707fef4.zip
dont use power to go up a level in menus on x5 (blame jhMikeS) take 2
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10930 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/keymaps/keymap-x5.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c
index a980cfaad2..05985fedb1 100644
--- a/apps/keymaps/keymap-x5.c
+++ b/apps/keymaps/keymap-x5.c
@@ -84,11 +84,13 @@ const struct button_mapping button_context_settings[] = {
{ ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE },
- { ACTION_NONE, BUTTON_POWER, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
};
-
+const struct button_mapping button_context_menu[] = {
+ { ACTION_NONE, BUTTON_POWER, BUTTON_NONE },
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+};
const struct button_mapping button_context_tree[] = {
{ ACTION_NONE, BUTTON_PLAY, BUTTON_NONE },
{ ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
@@ -297,8 +299,10 @@ const struct button_mapping* get_context_mapping( int context )
case CONTEXT_KEYBOARD:
return button_context_keyboard;
- case CONTEXT_LIST:
case CONTEXT_MAINMENU:
+ return button_context_menu;
+
+ case CONTEXT_LIST:
default:
return button_context_standard;
}