diff options
author | Magnus Holmgren <magnushol@gmail.com> | 2010-08-12 10:01:46 +0000 |
---|---|---|
committer | Magnus Holmgren <magnushol@gmail.com> | 2010-08-12 10:01:46 +0000 |
commit | 6d7900e3300a90f9a75a76793427723da0ff73bb (patch) | |
tree | 62cdf6be1560268fecf9d67b3987bb1e0f8a6e06 /apps/gui/skin_engine | |
parent | 0b9215809ad5b070fc4ae34af8db7fc4a5efa617 (diff) | |
download | rockbox-6d7900e3300a90f9a75a76793427723da0ff73bb.tar.gz rockbox-6d7900e3300a90f9a75a76793427723da0ff73bb.zip |
When using the tag argument in %%xd(): 1) clear the image first, so that images with transparency can be used; 2) allow things like battery level or volume, where a value is limited to the number of sub-images.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27786 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/skin_engine')
-rw-r--r-- | apps/gui/skin_engine/skin_render.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c index 912763c2c1..d48dd6b5b8 100644 --- a/apps/gui/skin_engine/skin_render.c +++ b/apps/gui/skin_engine/skin_render.c | |||
@@ -157,21 +157,24 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info, | |||
157 | { | 157 | { |
158 | char buf[16]; | 158 | char buf[16]; |
159 | const char *out; | 159 | const char *out; |
160 | int a = TOKEN_VALUE_ONLY; | 160 | int a = img->num_subimages; |
161 | out = get_token_value(gwps, id->token, buf, sizeof(buf), &a); | 161 | out = get_token_value(gwps, id->token, buf, sizeof(buf), &a); |
162 | |||
162 | /* NOTE: get_token_value() returns values starting at 1! */ | 163 | /* NOTE: get_token_value() returns values starting at 1! */ |
163 | if (a == -1) | 164 | if (a == -1) |
164 | a = (out && *out) ? 1 : 2; | 165 | a = (out && *out) ? 1 : 2; |
165 | a--; | 166 | a--; |
166 | a += id->offset; | 167 | a += id->offset; |
168 | |||
169 | /* Clear the image, as in conditionals */ | ||
170 | clear_image_pos(gwps, img); | ||
171 | |||
167 | /* If the token returned a value which is higher than | 172 | /* If the token returned a value which is higher than |
168 | * the amount of subimages clear the image. */ | 173 | * the amount of subimages, don't draw it. */ |
169 | if (a<0 || a >= img->num_subimages) | 174 | if (a >= 0 && a < img->num_subimages) |
170 | { | 175 | { |
171 | clear_image_pos(gwps, img); | ||
172 | } | ||
173 | else | ||
174 | img->display = a; | 176 | img->display = a; |
177 | } | ||
175 | } | 178 | } |
176 | } | 179 | } |
177 | break; | 180 | break; |