diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2021-08-10 21:27:28 +0100 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2021-08-10 22:48:26 +0100 |
commit | 69420e796c4008b8923b8241ab3e154442735678 (patch) | |
tree | a43ee2f15a1fa38faa8a1e0967d07b0d3e41b832 /apps/keymaps | |
parent | a8063054f90b6f134a8bac089667356b8e974a38 (diff) | |
download | rockbox-69420e796c4008b8923b8241ab3e154442735678.tar.gz rockbox-69420e796c4008b8923b8241ab3e154442735678.zip |
touchscreen: Use pointing mode in the yes/no screen
Seems to fix the unintuitive / inaccurate behavior of this screen.
Rejigger the generic touchscreen keymap because the 3x3 buttons are
no longer used. Also map physical keys for yes/no on the Q1.
Change-Id: I2ed633896b87030fa654d47d9d02929b849495da
Diffstat (limited to 'apps/keymaps')
-rw-r--r-- | apps/keymaps/keymap-shanlingq1.c | 9 | ||||
-rw-r--r-- | apps/keymaps/keymap-touchscreen.c | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/apps/keymaps/keymap-shanlingq1.c b/apps/keymaps/keymap-shanlingq1.c index 4745139e7a..2c09a40f4b 100644 --- a/apps/keymaps/keymap-shanlingq1.c +++ b/apps/keymaps/keymap-shanlingq1.c | |||
@@ -57,6 +57,13 @@ static const struct button_mapping button_context_list[] = { | |||
57 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 57 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
58 | }; /* button_context_list */ | 58 | }; /* button_context_list */ |
59 | 59 | ||
60 | static const struct button_mapping button_context_yesno[] = { | ||
61 | /* note: touchscreen buttons are usable in addition to physical keys */ | ||
62 | {ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE}, | ||
63 | {ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE}, | ||
64 | LAST_ITEM_IN_LIST | ||
65 | }; /* button_context_yesno */ | ||
66 | |||
60 | const struct button_mapping* target_get_context_mapping(int context) | 67 | const struct button_mapping* target_get_context_mapping(int context) |
61 | { | 68 | { |
62 | switch (context) | 69 | switch (context) |
@@ -73,5 +80,7 @@ const struct button_mapping* target_get_context_mapping(int context) | |||
73 | //return button_context_tree; | 80 | //return button_context_tree; |
74 | case CONTEXT_LIST: | 81 | case CONTEXT_LIST: |
75 | return button_context_list; | 82 | return button_context_list; |
83 | case CONTEXT_YESNOSCREEN: | ||
84 | return button_context_yesno; | ||
76 | } | 85 | } |
77 | } | 86 | } |
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c index 6163cb054c..c70aea2651 100644 --- a/apps/keymaps/keymap-touchscreen.c +++ b/apps/keymaps/keymap-touchscreen.c | |||
@@ -179,8 +179,6 @@ static const struct button_mapping button_context_mainmenu[] = | |||
179 | 179 | ||
180 | 180 | ||
181 | static const struct button_mapping button_context_yesno[] = { | 181 | static const struct button_mapping button_context_yesno[] = { |
182 | { ACTION_YESNO_ACCEPT, BUTTON_TOPRIGHT, BUTTON_NONE }, | ||
183 | { ACTION_YESNO_ACCEPT, BUTTON_BOTTOMLEFT, BUTTON_NONE }, | ||
184 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_YESNOSCREEN) | 182 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_YESNOSCREEN) |
185 | }; /* button_context_settings_yesno */ | 183 | }; /* button_context_settings_yesno */ |
186 | 184 | ||