Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- commit f941dd18363fe33014090c5e1a880075cb967cd0
- Author: Jonathan Gordon <rockbox@jdgordon.info>
- Date: Thu Jan 19 19:35:19 2012 +1100
- skin touchregions: fix the 'none' region firing when it shouldnt.
- Change the none action return value so the various action layers don't get confused by ACTION_TOUCHSCREEN return codes which shouldn't be happening (i.e when a long press region overlaps a short press region whihc has the none action)
- Change-Id: I63db2c0b49597ada2c5ebd0ef98e99aeef4f522a
- diff --git a/apps/action.h b/apps/action.h
- index ccf3313..e46e4a6 100644
- --- a/apps/action.h
- +++ b/apps/action.h
- @@ -92,7 +92,8 @@ enum {
- ACTION_REDRAW, /* returned if keys are locked and we splash()'ed */
- ACTION_TOUCHSCREEN,
- ACTION_TOUCHSCREEN_MODE, /* toggle the touchscreen mode */
- -
- + ACTION_TOUCHSCREEN_IGNORE, /* used for the 'none' action in skins */
- +
- /* standard actions, use these first */
- ACTION_STD_PREV,
- ACTION_STD_PREVREPEAT,
- diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
- index 0118977..95dc11c 100644
- --- a/apps/gui/skin_engine/skin_parser.c
- +++ b/apps/gui/skin_engine/skin_parser.c
- @@ -1242,7 +1242,7 @@ static int parse_lasttouch(struct skin_element *element,
- struct touchaction {const char* s; int action;};
- static const struct touchaction touchactions[] = {
- /* generic actions, convert to screen actions on use */
- - {"none", ACTION_TOUCHSCREEN}, {"lock", ACTION_TOUCH_SOFTLOCK },
- + {"none", ACTION_TOUCHSCREEN_IGNORE},{"lock", ACTION_TOUCH_SOFTLOCK },
- {"prev", ACTION_STD_PREV }, {"next", ACTION_STD_NEXT },
- {"rwd", ACTION_STD_PREVREPEAT }, {"ffwd", ACTION_STD_NEXTREPEAT },
- {"hotkey", ACTION_STD_HOTKEY}, {"select", ACTION_STD_OK },
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement