diff options
author | Sebastian Leonhardt <sebastian.leonhardt@web.de> | 2016-08-23 00:02:09 +0200 |
---|---|---|
committer | Gerrit Rockbox <gerrit@rockbox.org> | 2016-08-24 00:39:50 +0200 |
commit | 108a0f3fd044c1523084fdb3d512dd09d20b520a (patch) | |
tree | 7b141036dae08185a458dc63dc9cc15ccf70b00f /apps | |
parent | 09bdb5132f4b8d637df8e264c509f133fa2504dc (diff) | |
download | rockbox-108a0f3fd044c1523084fdb3d512dd09d20b520a.tar.gz rockbox-108a0f3fd044c1523084fdb3d512dd09d20b520a.zip |
Samsung YP-R0: Fix settings keymap (apply FS#13073 by lebellium)
Change-Id: Id251900c510bddb15cdf7fe9a43cf7df46645923
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-ypr0.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/apps/keymaps/keymap-ypr0.c b/apps/keymaps/keymap-ypr0.c index 406fe5a9fe..99b692e920 100644 --- a/apps/keymaps/keymap-ypr0.c +++ b/apps/keymaps/keymap-ypr0.c | |||
@@ -105,14 +105,26 @@ static const struct button_mapping button_context_tree[] = { | |||
105 | }; /* button_context_tree */ | 105 | }; /* button_context_tree */ |
106 | 106 | ||
107 | static const struct button_mapping button_context_settings[] = { | 107 | static const struct button_mapping button_context_settings[] = { |
108 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, | ||
109 | { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
110 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, | ||
111 | { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
112 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | ||
113 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
114 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, | ||
115 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
116 | |||
117 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_TREE) | ||
118 | }; /* button_context_settings */ | ||
108 | 119 | ||
120 | static const struct button_mapping button_context_settings_right_is_inc[] = { | ||
109 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | 121 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, |
110 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 122 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
111 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | 123 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, |
112 | { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 124 | { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
113 | 125 | ||
114 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_TREE) | 126 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
115 | }; /* button_context_settings */ | 127 | }; /* button_context_settings_right_is_inc */ |
116 | 128 | ||
117 | static const struct button_mapping button_context_yesno[] = { | 129 | static const struct button_mapping button_context_yesno[] = { |
118 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, | 130 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, |
@@ -255,6 +267,10 @@ const struct button_mapping* get_context_mapping(int context) | |||
255 | case CONTEXT_SETTINGS: | 267 | case CONTEXT_SETTINGS: |
256 | return button_context_settings; | 268 | return button_context_settings; |
257 | 269 | ||
270 | case CONTEXT_CUSTOM|CONTEXT_SETTINGS: | ||
271 | case CONTEXT_SETTINGS_RECTRIGGER: | ||
272 | return button_context_settings_right_is_inc; | ||
273 | |||
258 | case CONTEXT_SETTINGS_COLOURCHOOSER: | 274 | case CONTEXT_SETTINGS_COLOURCHOOSER: |
259 | return button_context_colorchooser; | 275 | return button_context_colorchooser; |
260 | case CONTEXT_SETTINGS_EQ: | 276 | case CONTEXT_SETTINGS_EQ: |