summaryrefslogtreecommitdiffstats
path: root/apps/gui/skin_engine/skin_display.c
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/gui/skin_engine/skin_display.c
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/gui/skin_engine/skin_display.c')
-rw-r--r--apps/gui/skin_engine/skin_display.c9
1 files changed, 1 insertions, 8 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);
}