len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-16 08:32:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "[Feature] Skin engine Themes grab text from a file %ft(file, line) WIP"

Browse source 
This reverts commit 62b5dfd81d.

This was accidentally merged, and wasn't up-to-date anyway.

Change-Id: I4fcceb8dc4f86762701daab72498202cabd8295a
This commit is contained in:
Solomon Peachy 2024-12-07 13:47:49 -05:00
parent 3b78daed14
commit e6851a55ed
32 changed files with 50 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

23
apps/gui/skin_engine/skin_render.c
View file

@ -633,23 +633,20 @@ static int get_subline_timeout(struct gui_wps *gwps, struct skin_element* line)
{
token = SKINOFFSETTOPTR(skin_buffer, element->data);
if (token)
retval = token->value.i;
return token->value.i;
}
else if (element->type == CONDITIONAL)
{
struct conditional *conditional = SKINOFFSETTOPTR(skin_buffer, element->data);
int val = evaluate_conditional(gwps, 0, conditional, element->children_count);
int tmoval = get_subline_timeout(gwps, get_child(element->children, val));
if (tmoval >= 0)
int val = evaluate_conditional(gwps, 0, conditional,
element->children_count);
if (val >= 0)
{
return MAX(retval, tmoval); /* Bugfix %t()%?CONDITIONAL tmo ignored */
retval = get_subline_timeout(gwps, get_child(element->children, val));
if (retval >= 0)
return retval;
}
}
else if (element->type == COMMENT)
{
retval = 0; /* don't display this item */
}
element = SKINOFFSETTOPTR(skin_buffer, element->next);
}
return retval;
@ -660,7 +657,6 @@ bool skin_render_alternator(struct skin_element* element, struct skin_draw_info
bool changed_lines = false;
struct line_alternator *alternator = SKINOFFSETTOPTR(skin_buffer, element->data);
unsigned old_refresh = info->refresh_type;
if (info->refresh_type == SKIN_REFRESH_ALL)
{
alternator->current_line = element->children_count-1;
@ -701,10 +697,7 @@ bool skin_render_alternator(struct skin_element* element, struct skin_draw_info
if (suitable)
{
alternator->current_line = try_line;
if (TIME_AFTER(current_tick, alternator->next_change_tick))
{
alternator->next_change_tick = current_tick + rettimeout;
}
alternator->next_change_tick = current_tick + rettimeout;
}
info->refresh_type = SKIN_REFRESH_ALL;