len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-07 05:35:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

touchscreen: Allow bar tag touchregions to be labeled

Browse source 
This is necessary if you want to detect touches on the bar region
using %Tl conditionals. Suppressing the auto-created region and then
creating one manually using %T doesn't give exactly the same results
because user-defined touch regions can't yet specify padding.

Change-Id: I2f4bde8eb56ba89645c72f3cc9d4b2355b934abd
This commit is contained in:
Aidan MacDonald 2021-08-21 20:13:19 +01:00
parent b781beecf5
commit 1816667937
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
apps/gui/skin_engine/skin_parser.c
View file

@ -982,6 +982,7 @@ static int parse_progressbar_tag(struct skin_element* element,
char *image_filename = NULL;
#ifdef HAVE_TOUCHSCREEN
bool suppress_touchregion = false;
char *touchregion_label = NULL;
#endif
if (element->params_count == 0 &&
@ -1156,6 +1157,17 @@ static int parse_progressbar_tag(struct skin_element* element,
#ifdef HAVE_TOUCHSCREEN
else if (pb_op == eNOTOUCH)
suppress_touchregion = true;
else if (!strcmp(text, "touchlabel"))
{
if (curr_param+1 < element->params_count)
{
curr_param++;
param++;
touchregion_label = SKINOFFSETTOPTR(skin_buffer, param->data.text);
}
else /* option needs the next param */
return -1;
}
#endif
else if (token->type == SKIN_TOKEN_SETTING && pb_op == eSETTING_OFFSET)
{
@ -1285,7 +1297,7 @@ static int parse_progressbar_tag(struct skin_element* element,
region->press_length = PRESS;
region->last_press = -1;
region->bar = PTRTOSKINOFFSET(skin_buffer, pb);
region->label = PTRTOSKINOFFSET(skin_buffer, NULL);
region->label = PTRTOSKINOFFSET(skin_buffer, touchregion_label);
item = new_skin_token_list_item(NULL, region);
if (!item)