From 34031cba5bddcc29dee0f61b3ea6ee1529014181 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Tue, 28 Feb 2012 22:05:28 +1100 Subject: 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 --- apps/gui/skin_engine/skin_display.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'apps/gui/skin_engine/skin_display.c') 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); } -- cgit v1.2.3