summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-05-18 16:49:26 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-05-18 22:51:01 +0200
commit9e674c712f9cfa6342291add796979124b0740c7 (patch)
treefbc2f6b5a1236eea97be1f495f59c995affc64ba /apps
parent2da6766f7598a7d77ac362caded2bba1a4d20318 (diff)
downloadrockbox-9e674c712f9cfa6342291add796979124b0740c7.tar.gz
rockbox-9e674c712f9cfa6342291add796979124b0740c7.tar.bz2
rockbox-9e674c712f9cfa6342291add796979124b0740c7.zip
FS#13195: rocker: Improved root menu keymap (Howard Richardson)
This patch addresses a keymapping anomaly on the Rocker. Currently the Power button when pressed inside a sub-menu will return you to the root of the menu. However when pressed again it returns you to the sub-menu you were in previously. This is at odds with how other ports work and makes it difficult to return to the WPS without manually selecting it on the root menu. This patch copies the behaviour of the home button on the Sansa Clip+. Pressing it once will exit a sub-menu and bring you back to the root menu. Pressing it again takes you to the WPS. No functionality is lost or covered up by making this reassignment. Change-Id: I17789457d49b087a2b4c75f4490ec722d9479a9b
Diffstat (limited to 'apps')
-rw-r--r--apps/keymaps/keymap-agptekrocker.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/keymaps/keymap-agptekrocker.c b/apps/keymaps/keymap-agptekrocker.c
index aa7c687ce4..1c13239bea 100644
--- a/apps/keymaps/keymap-agptekrocker.c
+++ b/apps/keymaps/keymap-agptekrocker.c
@@ -54,6 +54,12 @@ static const struct button_mapping button_context_standard[] = {
}; /* button_context_standard */
+static const struct button_mapping button_context_mainmenu[] = {
+ { ACTION_TREE_WPS, BUTTON_POWER, BUTTON_NONE },
+
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_TREE),
+}; /* button_context_mainmenu as with sansa clip mapping - "back" button returns you to WPS */
+
static const struct button_mapping button_context_wps[] = {
/* { ACTION_WPS_BROWSE, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, */
{ ACTION_WPS_PLAY, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
@@ -223,6 +229,7 @@ const struct button_mapping* get_context_mapping(int context)
return button_context_wps;
case CONTEXT_MAINMENU:
+ return button_context_mainmenu;
case CONTEXT_TREE:
case CONTEXT_LIST:
return button_context_list;