summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Conrad <dconrad@fastmail.com>2021-03-16 21:06:15 -0500
committerSolomon Peachy <pizza@shaftnet.org>2021-03-17 13:29:00 +0000
commite0490991652ee8573841293df9f283b7374cd818 (patch)
treef077f5fe711f18cfb4d885f7f1c8338b88e1b18c
parent25c9f716ce71c436f91522a13783bb79cb92e8b0 (diff)
downloadrockbox-e0490991652ee8573841293df9f283b7374cd818.tar.gz
rockbox-e0490991652ee8573841293df9f283b7374cd818.zip
erosq: Move ACTION_TREE_WPS to list context for use in Files and Database
The ACTION_TREE_WPS (held back button) was a part of the mainmenu context, moved to list context so it would work in Files and Database as well for consistency. Change-Id: I3749d7b4fd041db80e81c1a79d30c2c7bdd64829
-rw-r--r--apps/keymaps/keymap-erosq.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/keymaps/keymap-erosq.c b/apps/keymaps/keymap-erosq.c
index 3a841faf82..2dbb285de5 100644
--- a/apps/keymaps/keymap-erosq.c
+++ b/apps/keymaps/keymap-erosq.c
@@ -54,9 +54,6 @@ static const struct button_mapping button_context_standard[] = {
54}; /* button_context_standard */ 54}; /* button_context_standard */
55 55
56static const struct button_mapping button_context_mainmenu[] = { 56static const struct button_mapping button_context_mainmenu[] = {
57 { ACTION_TREE_WPS, BUTTON_BACK|BUTTON_REPEAT, BUTTON_BACK }, // settings menu is mainmenu context,
58 // so if we don't use repeat it will
59 // jump back to main menu root
60 57
61 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_TREE), 58 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_TREE),
62}; /* button_context_mainmenu as with sansa clip mapping - "back" button returns you to WPS */ 59}; /* button_context_mainmenu as with sansa clip mapping - "back" button returns you to WPS */
@@ -105,6 +102,7 @@ static const struct button_mapping button_context_list[] = {
105/* ACTION_LISTTREE_PGUP, optional 102/* ACTION_LISTTREE_PGUP, optional
106 * ACTION_LISTTREE_PGDOWN, optional 103 * ACTION_LISTTREE_PGDOWN, optional
107 */ 104 */
105 { ACTION_TREE_WPS, BUTTON_BACK|BUTTON_REPEAT, BUTTON_BACK }, // back returns to WPS from many contexts
108 106
109#ifdef HAVE_VOLUME_IN_LIST 107#ifdef HAVE_VOLUME_IN_LIST
110 { ACTION_LIST_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, 108 { ACTION_LIST_VOLUP, BUTTON_VOL_UP, BUTTON_NONE },