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.
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
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 2cd5aae..486a2ef 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -418,7 +418,7 @@
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;
diff --git a/apps/gui/statusbar-skinned.c b/apps/gui/statusbar-skinned.c
index 840ad63..0902950 100644
--- a/apps/gui/statusbar-skinned.c
+++ b/apps/gui/statusbar-skinned.c
@@ -58,7 +58,8 @@
}
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;