Pastebin launched a little side project called HostCabi.net, check it out ;-)Don't like ads? PRO users don't see any ads ;-)
Guest

Untitled

By: a guest on Jan 19th, 2012  |  syntax: None  |  size: 1.79 KB  |  hits: 52  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. commit f941dd18363fe33014090c5e1a880075cb967cd0
  2. Author: Jonathan Gordon <rockbox@jdgordon.info>
  3. Date:   Thu Jan 19 19:35:19 2012 +1100
  4.  
  5.     skin touchregions: fix the 'none' region firing when it shouldnt.
  6.    
  7.     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)
  8.    
  9.     Change-Id: I63db2c0b49597ada2c5ebd0ef98e99aeef4f522a
  10.  
  11. diff --git a/apps/action.h b/apps/action.h
  12. index ccf3313..e46e4a6 100644
  13. --- a/apps/action.h
  14. +++ b/apps/action.h
  15. @@ -92,7 +92,8 @@ enum {
  16.      ACTION_REDRAW, /* returned if keys are locked and we splash()'ed */
  17.      ACTION_TOUCHSCREEN,
  18.      ACTION_TOUCHSCREEN_MODE, /* toggle the touchscreen mode */
  19. -    
  20. +    ACTION_TOUCHSCREEN_IGNORE, /* used for the 'none' action in skins */
  21. +
  22.      /* standard actions, use these first */
  23.      ACTION_STD_PREV,
  24.      ACTION_STD_PREVREPEAT,
  25. diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
  26. index 0118977..95dc11c 100644
  27. --- a/apps/gui/skin_engine/skin_parser.c
  28. +++ b/apps/gui/skin_engine/skin_parser.c
  29. @@ -1242,7 +1242,7 @@ static int parse_lasttouch(struct skin_element *element,
  30.  struct touchaction {const char* s; int action;};
  31.  static const struct touchaction touchactions[] = {
  32.      /* generic actions, convert to screen actions on use */
  33. -    {"none", ACTION_TOUCHSCREEN},       {"lock", ACTION_TOUCH_SOFTLOCK },
  34. +    {"none", ACTION_TOUCHSCREEN_IGNORE},{"lock", ACTION_TOUCH_SOFTLOCK },
  35.      {"prev", ACTION_STD_PREV },         {"next", ACTION_STD_NEXT },
  36.      {"rwd", ACTION_STD_PREVREPEAT },    {"ffwd", ACTION_STD_NEXTREPEAT },
  37.      {"hotkey", ACTION_STD_HOTKEY},      {"select", ACTION_STD_OK },