diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2022-10-04 14:10:43 +0100 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2022-11-23 10:06:16 -0500 |
commit | 830436a282e49caea4bd15bfa8c133b4c5d422dd (patch) | |
tree | b331ca6e8755e60de69e1a834adec461ee5a9168 | |
parent | 9368844ad17a11f28763cc7038d05bd51ddd970e (diff) | |
download | rockbox-830436a282e49caea4bd15bfa8c133b4c5d422dd.tar.gz rockbox-830436a282e49caea4bd15bfa8c133b4c5d422dd.zip |
skin engine: Remove viewport_colour viewport field
Yet again, no need to store the viewport because we already know
it -- and this time the render code is obviously relying on that
assumption.
Change-Id: Id5eb7cd9999fbe1efccd54bd8f0fd3c8a3011c8e
-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, | |||
747 | &colour->colour)) | 747 | &colour->colour)) |
748 | return -1; | 748 | return -1; |
749 | } | 749 | } |
750 | colour->vp = PTRTOSKINOFFSET(skin_buffer, &curr_vp->vp); | ||
751 | token->value.data = PTRTOSKINOFFSET(skin_buffer, colour); | 750 | token->value.data = PTRTOSKINOFFSET(skin_buffer, colour); |
752 | if (element->line == curr_viewport_element->line) | 751 | if (element->line == curr_viewport_element->line) |
753 | { | 752 | { |
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, | |||
110 | { | 110 | { |
111 | struct viewport_colour *col = SKINOFFSETTOPTR(skin_buffer, token->value.data); | 111 | struct viewport_colour *col = SKINOFFSETTOPTR(skin_buffer, token->value.data); |
112 | if (!col) return false; | 112 | if (!col) return false; |
113 | struct viewport *vp = SKINOFFSETTOPTR(skin_buffer, col->vp); | 113 | skin_vp->vp.fg_pattern = col->colour; |
114 | if (!vp) return false; | ||
115 | vp->fg_pattern = col->colour; | ||
116 | skin_vp->fgbg_changed = true; | 114 | skin_vp->fgbg_changed = true; |
117 | } | 115 | } |
118 | break; | 116 | break; |
@@ -120,9 +118,7 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info, | |||
120 | { | 118 | { |
121 | struct viewport_colour *col = SKINOFFSETTOPTR(skin_buffer, token->value.data); | 119 | struct viewport_colour *col = SKINOFFSETTOPTR(skin_buffer, token->value.data); |
122 | if (!col) return false; | 120 | if (!col) return false; |
123 | struct viewport *vp = SKINOFFSETTOPTR(skin_buffer, col->vp); | 121 | skin_vp->vp.bg_pattern = col->colour; |
124 | if (!vp) return false; | ||
125 | vp->bg_pattern = col->colour; | ||
126 | skin_vp->fgbg_changed = true; | 122 | skin_vp->fgbg_changed = true; |
127 | } | 123 | } |
128 | break; | 124 | 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 { | |||
196 | #endif | 196 | #endif |
197 | }; | 197 | }; |
198 | struct viewport_colour { | 198 | struct viewport_colour { |
199 | OFFSETTYPE(struct viewport *) vp; | ||
200 | unsigned colour; | 199 | unsigned colour; |
201 | }; | 200 | }; |
202 | 201 | ||