diff options
| author | Dana Conrad <dconrad@fastmail.com> | 2021-03-14 11:27:45 -0500 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2021-03-14 17:06:22 +0000 |
| commit | 99383a0f9ba9e940a4017890965494c373a7f09a (patch) | |
| tree | 46b55dc89e210fbbf24ca28f384ec4853dc4b747 | |
| parent | 6b39e23074afabcc96b9e26ac918534228c48711 (diff) | |
| download | rockbox-99383a0f9ba9e940a4017890965494c373a7f09a.tar.gz rockbox-99383a0f9ba9e940a4017890965494c373a7f09a.zip | |
erosq: change keymap to fix back button
Back button's ACTION_TREE_WPS state in the mainmenu context causes
a jump back to the main menu root from anywhere in the settings tree.
Changing it to a held button fixes this.
Also changed the ACTION_STD_CANCEL functionality of the back button
in the standard context to be on release, just because I think
it feels better to use.
Also added myself to docs/CREDITS
Change-Id: Ia5892f4d995431abe0616f00fd5cc8368dd750a2
| -rw-r--r-- | apps/keymaps/keymap-erosq.c | 6 | ||||
| -rw-r--r-- | docs/CREDITS | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/apps/keymaps/keymap-erosq.c b/apps/keymaps/keymap-erosq.c index 944e5e4ec0..3a841faf82 100644 --- a/apps/keymaps/keymap-erosq.c +++ b/apps/keymaps/keymap-erosq.c @@ -39,7 +39,7 @@ static const struct button_mapping button_context_standard[] = { { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE }, { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, - { ACTION_STD_CANCEL, BUTTON_BACK, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_BACK|BUTTON_REL, BUTTON_BACK }, // release just because it feels better to use { ACTION_STD_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE }, @@ -54,7 +54,9 @@ static const struct button_mapping button_context_standard[] = { }; /* button_context_standard */ static const struct button_mapping button_context_mainmenu[] = { - { ACTION_TREE_WPS, BUTTON_BACK, BUTTON_NONE }, + { ACTION_TREE_WPS, BUTTON_BACK|BUTTON_REPEAT, BUTTON_BACK }, // settings menu is mainmenu context, + // so if we don't use repeat it will + // jump back to main menu root LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_TREE), }; /* button_context_mainmenu as with sansa clip mapping - "back" button returns you to WPS */ diff --git a/docs/CREDITS b/docs/CREDITS index a8f90c0dd1..720c3a99db 100644 --- a/docs/CREDITS +++ b/docs/CREDITS @@ -743,4 +743,5 @@ The Pocket Quake team (Dan East and others) The bzip2 team The bsdiff team The libtomcrypt team -Spencer Brennessel
\ No newline at end of file +Spencer Brennessel +Dana Conrad |