diff options
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 1 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_render.c | 8 | ||||
-rw-r--r-- | apps/gui/skin_engine/wps_internals.h | 1 |
3 files changed, 2 insertions, 8 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index f59ae09e54..9fb15d8e56 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -747,7 +747,6 @@ static int parse_viewportcolour(struct skin_element *element, &colour->colour)) return -1; } - colour->vp = PTRTOSKINOFFSET(skin_buffer, &curr_vp->vp); token->value.data = PTRTOSKINOFFSET(skin_buffer, colour); if (element->line == curr_viewport_element->line) { diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c index 07d8a13658..06f7d9798d 100644 --- a/apps/gui/skin_engine/skin_render.c +++ b/apps/gui/skin_engine/skin_render.c @@ -110,9 +110,7 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info, { struct viewport_colour *col = SKINOFFSETTOPTR(skin_buffer, token->value.data); if (!col) return false; - struct viewport *vp = SKINOFFSETTOPTR(skin_buffer, col->vp); - if (!vp) return false; - vp->fg_pattern = col->colour; + skin_vp->vp.fg_pattern = col->colour; skin_vp->fgbg_changed = true; } break; @@ -120,9 +118,7 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info, { struct viewport_colour *col = SKINOFFSETTOPTR(skin_buffer, token->value.data); if (!col) return false; - struct viewport *vp = SKINOFFSETTOPTR(skin_buffer, col->vp); - if (!vp) return false; - vp->bg_pattern = col->colour; + skin_vp->vp.bg_pattern = col->colour; skin_vp->fgbg_changed = true; } break; diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h index 1049954caf..f2988512d9 100644 --- a/apps/gui/skin_engine/wps_internals.h +++ b/apps/gui/skin_engine/wps_internals.h @@ -196,7 +196,6 @@ struct skin_viewport { #endif }; struct viewport_colour { - OFFSETTYPE(struct viewport *) vp; unsigned colour; }; |