Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
skin engine: Fix some user-created touch regions being suppressed
Fix the heuristic used for detecting a touch-enabled theme.
The old method assumes that volume bar and progress bar tags
are always auto-created, but this might not be true. Instead,
mark regions that originate from a %T tag as user-created and
check for those.
Change-Id: Iec732d299a2b4e298bef8069a68ff94e3b642703
+4
-2
+3
-2
apps/gui/skin_engine/skin_parser.c
+3
-2
apps/gui/skin_engine/skin_parser.c
···
1294
1294
region->wvp = PTRTOSKINOFFSET(skin_buffer, curr_vp);
1295
1295
region->reverse_bar = false;
1296
1296
region->allow_while_locked = false;
1297
+
region->user_region = false;
1297
1298
region->press_length = PRESS;
1298
1299
region->last_press = -1;
1299
1300
region->bar = PTRTOSKINOFFSET(skin_buffer, pb);
···
1797
1798
region->last_press = -1;
1798
1799
region->press_length = PRESS;
1799
1800
region->allow_while_locked = false;
1801
+
region->user_region = true;
1800
1802
region->bar = PTRTOSKINOFFSET(skin_buffer, NULL);
1801
1803
1802
1804
action = get_param_text(element, p++);
···
2721
2723
struct touchregion *r = NULL;
2722
2724
if (token)
2723
2725
r = SKINOFFSETTOPTR(skin_buffer, token->value.data);
2724
-
if (r && r->action != ACTION_TOUCH_SCROLLBAR &&
2725
-
r->action != ACTION_TOUCH_VOLUME)
2726
+
if (r && r->user_region)
2726
2727
{
2727
2728
user_touch_region_found = true;
2728
2729
break;
+1
apps/gui/skin_engine/wps_internals.h
+1
apps/gui/skin_engine/wps_internals.h
···
219
219
int16_t hpad; /* padding to height */
220
220
bool reverse_bar; /* if true 0% is the left or top */
221
221
bool allow_while_locked;
222
+
bool user_region; /* if true this is a user-defined region */
222
223
enum {
223
224
PRESS, /* quick press only */
224
225
LONG_PRESS, /* Long press without repeat */