diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2012-02-28 22:05:28 +1100 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2012-02-28 23:51:01 +1100 |
commit | 34031cba5bddcc29dee0f61b3ea6ee1529014181 (patch) | |
tree | fed3c7dc82c2711f505dc5e51a9c4ce71470c606 /apps/gui/skin_engine/skin_display.c | |
parent | 0807fe8d3634010a8a8303e5b0a7abb2bd28a937 (diff) | |
download | rockbox-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.c | 9 |
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) | |||
298 | { | 298 | { |
299 | struct screen *display = gwps->display; | 299 | struct screen *display = gwps->display; |
300 | img->bm.data = core_get_data(img->buflib_handle); | 300 | img->bm.data = core_get_data(img->buflib_handle); |
301 | if(img->always_display) | 301 | display->set_drawmode(DRMODE_SOLID); |
302 | display->set_drawmode(DRMODE_FG); | ||
303 | else | ||
304 | display->set_drawmode(DRMODE_SOLID); | ||
305 | 302 | ||
306 | display->bmp_part(&img->bm, 0, img->subimage_height * subimage, | 303 | display->bmp_part(&img->bm, 0, img->subimage_height * subimage, |
307 | img->x, img->y, img->bm.width, img->subimage_height); | 304 | 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) | |||
331 | { | 328 | { |
332 | wps_draw_image(gwps, img, img->display); | 329 | wps_draw_image(gwps, img, img->display); |
333 | } | 330 | } |
334 | else if (img->always_display && SKINOFFSETTOPTR(get_skin_buffer(data), img->vp) == vp) | ||
335 | { | ||
336 | wps_draw_image(gwps, img, 0); | ||
337 | } | ||
338 | } | 331 | } |
339 | list = SKINOFFSETTOPTR(get_skin_buffer(data), list->next); | 332 | list = SKINOFFSETTOPTR(get_skin_buffer(data), list->next); |
340 | } | 333 | } |