summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2012-02-28 22:05:28 +1100
committerJonathan Gordon <rockbox@jdgordon.info>2012-02-28 23:51:01 +1100
commit34031cba5bddcc29dee0f61b3ea6ee1529014181 (patch)
treefed3c7dc82c2711f505dc5e51a9c4ce71470c606 /apps
parent0807fe8d3634010a8a8303e5b0a7abb2bd28a937 (diff)
downloadrockbox-34031cba5bddcc29dee0f61b3ea6ee1529014181.tar.gz
rockbox-34031cba5bddcc29dee0f61b3ea6ee1529014181.zip
skin_engine: Clean up %x() handling - beware theme issues
Internally remove some hacks around how %x() is handled. %x() inside the default viewport will no longer work if other viewports are used, so if you are using viewports and %x() make sure it is in a viewport! Change-Id: I8ecab805d55fc0f8476ff0516cba38e23400aa20
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/skin_engine/skin_display.c9
-rw-r--r--apps/gui/skin_engine/skin_parser.c4
-rw-r--r--apps/gui/skin_engine/skin_render.c7
-rw-r--r--apps/gui/skin_engine/wps_internals.h1
4 files changed, 9 insertions, 12 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index 0613f986b3..0b3ba65751 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -298,10 +298,7 @@ void wps_draw_image(struct gui_wps *gwps, struct gui_img *img, int subimage)
{
struct screen *display = gwps->display;
img->bm.data = core_get_data(img->buflib_handle);
- if(img->always_display)
- display->set_drawmode(DRMODE_FG);
- else
- display->set_drawmode(DRMODE_SOLID);
+ display->set_drawmode(DRMODE_SOLID);
display->bmp_part(&img->bm, 0, img->subimage_height * subimage,
img->x, img->y, img->bm.width, img->subimage_height);
@@ -331,10 +328,6 @@ void wps_display_images(struct gui_wps *gwps, struct viewport* vp)
{
wps_draw_image(gwps, img, img->display);
}
- else if (img->always_display && SKINOFFSETTOPTR(get_skin_buffer(data), img->vp) == vp)
- {
- wps_draw_image(gwps, img, 0);
- }
}
list = SKINOFFSETTOPTR(get_skin_buffer(data), list->next);
}
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 0fe8789bcb..3b83d9e199 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -415,7 +415,6 @@ static int parse_image_load(struct skin_element *element,
img->x = x;
img->y = y;
img->num_subimages = 1;
- img->always_display = false;
img->display = -1;
img->using_preloaded_icons = false;
img->buflib_handle = -1;
@@ -425,7 +424,7 @@ static int parse_image_load(struct skin_element *element,
if (token->type == SKIN_TOKEN_IMAGE_DISPLAY)
{
- img->always_display = true;
+ token->value.data = PTRTOSKINOFFSET(skin_buffer, img);
}
else if (element->params_count == 5)
{
@@ -1000,7 +999,6 @@ static int parse_progressbar_tag(struct skin_element* element,
img->x = 0;
img->y = 0;
img->num_subimages = 1;
- img->always_display = false;
img->display = -1;
img->using_preloaded_icons = false;
img->buflib_handle = -1;
diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c
index ee42dfa5a7..f86b161eab 100644
--- a/apps/gui/skin_engine/skin_render.c
+++ b/apps/gui/skin_engine/skin_render.c
@@ -198,6 +198,13 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info,
#endif
break;
#ifdef HAVE_LCD_BITMAP
+ case SKIN_TOKEN_IMAGE_DISPLAY:
+ {
+ struct gui_img *img = SKINOFFSETTOPTR(skin_buffer, token->value.data);
+ if (img && img->loaded && do_refresh)
+ img->display = 0;
+ }
+ break;
case SKIN_TOKEN_IMAGE_DISPLAY_LISTICON:
case SKIN_TOKEN_IMAGE_PRELOAD_DISPLAY:
{
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h
index 1ea5dbf467..3b1d7cf054 100644
--- a/apps/gui/skin_engine/wps_internals.h
+++ b/apps/gui/skin_engine/wps_internals.h
@@ -80,7 +80,6 @@ struct gui_img {
int buflib_handle;
OFFSETTYPE(char*) label;
bool loaded; /* load state */
- bool always_display; /* not using the preload/display mechanism */
int display;
bool using_preloaded_icons; /* using the icon system instead of a bmp */
};