diff options
author | Rob Purchase <shotofadds@rockbox.org> | 2009-09-26 15:23:46 +0000 |
---|---|---|
committer | Rob Purchase <shotofadds@rockbox.org> | 2009-09-26 15:23:46 +0000 |
commit | 8e365ba12b75f1ebb360342bcd2804d7a245e5bf (patch) | |
tree | bcd367fbf28601b1c205d7f1aed8bac9f79f0c44 /apps | |
parent | e6fbdfc10f44ad5773e27d1cb515179a86028ccb (diff) | |
download | rockbox-8e365ba12b75f1ebb360342bcd2804d7a245e5bf.tar.gz rockbox-8e365ba12b75f1ebb360342bcd2804d7a245e5bf.zip |
Make the EQ screen usable in touchscreen grid mode by resolving keymap conflicts.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22841 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-touchscreen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c index bb915b071b..4b86efa29e 100644 --- a/apps/keymaps/keymap-touchscreen.c +++ b/apps/keymaps/keymap-touchscreen.c | |||
@@ -127,8 +127,6 @@ static const struct button_mapping button_context_settings[] = { | |||
127 | { ACTION_SETTINGS_INCREPEAT, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, | 127 | { ACTION_SETTINGS_INCREPEAT, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, |
128 | { ACTION_SETTINGS_DEC, BUTTON_BOTTOMMIDDLE, BUTTON_NONE }, | 128 | { ACTION_SETTINGS_DEC, BUTTON_BOTTOMMIDDLE, BUTTON_NONE }, |
129 | { ACTION_SETTINGS_DECREPEAT, BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, | 129 | { ACTION_SETTINGS_DECREPEAT, BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, |
130 | { ACTION_STD_OK, BUTTON_CENTER, BUTTON_NONE }, | ||
131 | { ACTION_STD_CANCEL, BUTTON_MIDLEFT, BUTTON_NONE }, | ||
132 | 130 | ||
133 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_SETTINGS) | 131 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_SETTINGS) |
134 | }; /* button_context_settings */ | 132 | }; /* button_context_settings */ |
@@ -142,7 +140,6 @@ static const struct button_mapping button_context_settings_right_is_inc[] = { | |||
142 | { ACTION_SETTINGS_INCREPEAT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 140 | { ACTION_SETTINGS_INCREPEAT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
143 | { ACTION_SETTINGS_DEC, BUTTON_MIDLEFT, BUTTON_NONE }, | 141 | { ACTION_SETTINGS_DEC, BUTTON_MIDLEFT, BUTTON_NONE }, |
144 | { ACTION_SETTINGS_DECREPEAT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, | 142 | { ACTION_SETTINGS_DECREPEAT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, |
145 | { ACTION_STD_OK, BUTTON_CENTER, BUTTON_NONE }, | ||
146 | { ACTION_STD_CANCEL, BUTTON_TOPLEFT, BUTTON_NONE }, | 143 | { ACTION_STD_CANCEL, BUTTON_TOPLEFT, BUTTON_NONE }, |
147 | 144 | ||
148 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_SETTINGS) | 145 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_SETTINGS) |
@@ -159,6 +156,9 @@ static const struct button_mapping button_context_colorchooser[] = { | |||
159 | }; /* button_context_colorchooser */ | 156 | }; /* button_context_colorchooser */ |
160 | 157 | ||
161 | static const struct button_mapping button_context_eq[] = { | 158 | static const struct button_mapping button_context_eq[] = { |
159 | /* override the std context since we're using MIDRIGHT for settings inc */ | ||
160 | { ACTION_NONE, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_MIDRIGHT }, | ||
161 | { ACTION_NONE, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_MIDRIGHT }, | ||
162 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_SETTINGS_EQ), | 162 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_SETTINGS_EQ), |
163 | }; /* button_context_eq */ | 163 | }; /* button_context_eq */ |
164 | 164 | ||