Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

erosq: change keymap to fix back button

Browse source 
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
This commit is contained in:
Dana Conrad 2021-03-14 11:27:45 -05:00 committed by Solomon Peachy
parent 6b39e23074
commit 99383a0f9b
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/keymaps/keymap-erosq.c
View file

@ -39,7 +39,7 @@ static const struct button_mapping button_context_standard[] = {
{ ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE },
{ ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { 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_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
{ ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
{ ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE }, { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE },
@ -54,7 +54,9 @@ static const struct button_mapping button_context_standard[] = {
}; /* button_context_standard */ }; /* button_context_standard */
static const struct button_mapping button_context_mainmenu[] = { 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), LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_TREE),
}; /* button_context_mainmenu as with sansa clip mapping - "back" button returns you to WPS */ }; /* button_context_mainmenu as with sansa clip mapping - "back" button returns you to WPS */

1
docs/CREDITS
View file

@ -744,3 +744,4 @@ The bzip2 team
The bsdiff team The bsdiff team
The libtomcrypt team The libtomcrypt team
Spencer Brennessel Spencer Brennessel
Dana Conrad