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

1 files changed, 7 insertions, 0 deletions

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:
         {