Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

revert r25054 - tags which have an off and a list of option should have off as the first not last option. also fix it so the no icon position actually works.

Browse source 
you can use %?Li<no|yes> if you want to.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25063 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-03-07 21:07:41 +00:00
parent fb70ec6ff9
commit 0376208a48
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/gui/skin_engine/skin_tokens.c
View file

@ -418,7 +418,7 @@ const char *get_token_value(struct gui_wps *gwps,
return (char*)token->value.data;
case WPS_TOKEN_LIST_TITLE_ICON:
if (intval)
*intval = MIN(token->value.i, limit-1);
*intval = token->value.i;
snprintf(buf, buf_size, "%d", token->value.i);
return buf;

3
apps/gui/statusbar-skinned.c
View file

@ -58,7 +58,8 @@ bool sb_set_title_text(char* title, enum themable_icons icon, enum screen_type s
}
else if (sb_skin_data[screen].tokens[i].type == WPS_TOKEN_LIST_TITLE_ICON)
{
sb_skin_data[screen].tokens[i].value.i = icon+1;
/* Icon_NOICON == -1 which the skin engine wants at position 1, so + 2 */
sb_skin_data[screen].tokens[i].value.i = icon+2;
}
}
return retval;