summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRob Purchase <shotofadds@rockbox.org>2009-09-26 15:23:46 +0000
committerRob Purchase <shotofadds@rockbox.org>2009-09-26 15:23:46 +0000
commit8e365ba12b75f1ebb360342bcd2804d7a245e5bf (patch)
treebcd367fbf28601b1c205d7f1aed8bac9f79f0c44 /apps
parente6fbdfc10f44ad5773e27d1cb515179a86028ccb (diff)
downloadrockbox-8e365ba12b75f1ebb360342bcd2804d7a245e5bf.tar.gz
rockbox-8e365ba12b75f1ebb360342bcd2804d7a245e5bf.tar.bz2
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.c6
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[] = {
{ ACTION_SETTINGS_INCREPEAT, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_BOTTOMMIDDLE, BUTTON_NONE },
{ ACTION_SETTINGS_DECREPEAT, BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_STD_OK, BUTTON_CENTER, BUTTON_NONE },
- { ACTION_STD_CANCEL, BUTTON_MIDLEFT, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_SETTINGS)
}; /* button_context_settings */
@@ -142,7 +140,6 @@ static const struct button_mapping button_context_settings_right_is_inc[] = {
{ ACTION_SETTINGS_INCREPEAT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_MIDLEFT, BUTTON_NONE },
{ ACTION_SETTINGS_DECREPEAT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_STD_OK, BUTTON_CENTER, BUTTON_NONE },
{ ACTION_STD_CANCEL, BUTTON_TOPLEFT, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_SETTINGS)
@@ -159,6 +156,9 @@ static const struct button_mapping button_context_colorchooser[] = {
}; /* button_context_colorchooser */
static const struct button_mapping button_context_eq[] = {
+ /* override the std context since we're using MIDRIGHT for settings inc */
+ { ACTION_NONE, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_MIDRIGHT },
+ { ACTION_NONE, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_MIDRIGHT },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_SETTINGS_EQ),
}; /* button_context_eq */