From 7e81c6ae09cd5655df2e2e619ca732561fc37c91 Mon Sep 17 00:00:00 2001 From: jdgordon Date: Sun, 7 Mar 2010 21:07:41 +0000 Subject: [PATCH] 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 if you want to. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25063 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/skin_tokens.c | 2 +- apps/gui/statusbar-skinned.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index 2cd5aaece..486a2efc7 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c @@ -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; diff --git a/apps/gui/statusbar-skinned.c b/apps/gui/statusbar-skinned.c index 840ad63c4..090295059 100644 --- a/apps/gui/statusbar-skinned.c +++ b/apps/gui/statusbar-skinned.c @@ -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; -- 2.11.4.GIT