diff options
Diffstat (limited to 'apps/gui/skin_engine/skin_parser.c')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index df08fe6115..659d974130 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -1039,7 +1039,7 @@ static int parse_lasttouch(struct skin_element *element, | |||
1039 | struct touchaction {const char* s; int action;}; | 1039 | struct touchaction {const char* s; int action;}; |
1040 | static const struct touchaction touchactions[] = { | 1040 | static const struct touchaction touchactions[] = { |
1041 | /* generic actions, convert to screen actions on use */ | 1041 | /* generic actions, convert to screen actions on use */ |
1042 | {"none", ACTION_TOUCHSCREEN}, | 1042 | {"none", ACTION_TOUCHSCREEN}, {"lock", ACTION_TOUCH_SOFTLOCK }, |
1043 | {"prev", ACTION_STD_PREV }, {"next", ACTION_STD_NEXT }, | 1043 | {"prev", ACTION_STD_PREV }, {"next", ACTION_STD_NEXT }, |
1044 | {"rwd", ACTION_STD_PREVREPEAT }, {"ffwd", ACTION_STD_NEXTREPEAT }, | 1044 | {"rwd", ACTION_STD_PREVREPEAT }, {"ffwd", ACTION_STD_NEXTREPEAT }, |
1045 | {"hotkey", ACTION_STD_HOTKEY}, {"select", ACTION_STD_OK }, | 1045 | {"hotkey", ACTION_STD_HOTKEY}, {"select", ACTION_STD_OK }, |
@@ -1122,17 +1122,23 @@ static int parse_touchregion(struct skin_element *element, | |||
1122 | region->value = 0; | 1122 | region->value = 0; |
1123 | region->last_press = 0xffff; | 1123 | region->last_press = 0xffff; |
1124 | region->press_length = PRESS; | 1124 | region->press_length = PRESS; |
1125 | region->allow_while_locked = false; | ||
1125 | action = element->params[p++].data.text; | 1126 | action = element->params[p++].data.text; |
1126 | 1127 | ||
1127 | strcpy(temp, action); | 1128 | strcpy(temp, action); |
1128 | action = temp; | 1129 | action = temp; |
1129 | 1130 | ||
1130 | if (*action == '!') | 1131 | switch (*action) |
1131 | { | 1132 | { |
1132 | region->reverse_bar = true; | 1133 | case '!': |
1133 | action++; | 1134 | region->reverse_bar = true; |
1135 | action++; | ||
1136 | break; | ||
1137 | case '^': | ||
1138 | action++; | ||
1139 | region->allow_while_locked = true; | ||
1140 | break; | ||
1134 | } | 1141 | } |
1135 | |||
1136 | if(!strcmp(pb_string, action)) | 1142 | if(!strcmp(pb_string, action)) |
1137 | region->action = ACTION_TOUCH_SCROLLBAR; | 1143 | region->action = ACTION_TOUCH_SCROLLBAR; |
1138 | else if(!strcmp(vol_string, action)) | 1144 | else if(!strcmp(vol_string, action)) |