From 7343863a2163a00a14725eb9420e7fda5707fef4 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Mon, 11 Sep 2006 12:53:46 +0000 Subject: 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 --- apps/keymaps/keymap-x5.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'apps') 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; } -- cgit v1.2.3