diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2022-10-04 14:35:16 +0100 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2022-10-18 12:56:28 +0100 |
commit | e27a6bad4fd9b0528d580e343a43257d25df269a (patch) | |
tree | aa9df63ad46ae2d5c09f1d1c567b87f5d69b0fa7 /apps/gui/skin_engine/skin_render.c | |
parent | 015101bb2cfd57699d27706077c9617f3e383c93 (diff) | |
download | rockbox-e27a6bad4fd9b0528d580e343a43257d25df269a.tar.gz rockbox-e27a6bad4fd9b0528d580e343a43257d25df269a.zip |
skin engine: Remove redundant argument from do_non_text_tags()
The skin viewport is already passed in info->skin_vp.
Change-Id: I5369684ba2a743d7bd804b33845bdb6ac17c46d0
Diffstat (limited to 'apps/gui/skin_engine/skin_render.c')
-rw-r--r-- | apps/gui/skin_engine/skin_render.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c index e5d2078177..20e062e136 100644 --- a/apps/gui/skin_engine/skin_render.c +++ b/apps/gui/skin_engine/skin_render.c | |||
@@ -96,11 +96,11 @@ get_child(OFFSETTYPE(struct skin_element**) children, int child) | |||
96 | 96 | ||
97 | 97 | ||
98 | static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info, | 98 | static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info, |
99 | struct skin_element *element, struct skin_viewport* skin_vp) | 99 | struct skin_element *element) |
100 | { | 100 | { |
101 | struct wps_token *token = (struct wps_token *)SKINOFFSETTOPTR(skin_buffer, element->data); | 101 | struct wps_token *token = (struct wps_token *)SKINOFFSETTOPTR(skin_buffer, element->data); |
102 | if (!token) return false; | 102 | if (!token) return false; |
103 | struct viewport *vp = &skin_vp->vp; | 103 | struct skin_viewport *skin_vp = info->skin_vp; |
104 | struct wps_data *data = gwps->data; | 104 | struct wps_data *data = gwps->data; |
105 | bool do_refresh = (element->tag->flags & info->refresh_type) > 0; | 105 | bool do_refresh = (element->tag->flags & info->refresh_type) > 0; |
106 | 106 | ||
@@ -199,7 +199,7 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info, | |||
199 | case SKIN_TOKEN_PEAKMETER: | 199 | case SKIN_TOKEN_PEAKMETER: |
200 | data->peak_meter_enabled = true; | 200 | data->peak_meter_enabled = true; |
201 | if (do_refresh) | 201 | if (do_refresh) |
202 | draw_peakmeters(gwps, info->line_number, vp); | 202 | draw_peakmeters(gwps, info->line_number, &skin_vp->vp); |
203 | break; | 203 | break; |
204 | case SKIN_TOKEN_DRAWRECTANGLE: | 204 | case SKIN_TOKEN_DRAWRECTANGLE: |
205 | if (do_refresh) | 205 | if (do_refresh) |
@@ -218,13 +218,13 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info, | |||
218 | #endif | 218 | #endif |
219 | { | 219 | { |
220 | #if LCD_DEPTH > 1 | 220 | #if LCD_DEPTH > 1 |
221 | unsigned backup = vp->fg_pattern; | 221 | unsigned backup = skin_vp->vp.fg_pattern; |
222 | vp->fg_pattern = rect->start_colour; | 222 | skin_vp->vp.fg_pattern = rect->start_colour; |
223 | #endif | 223 | #endif |
224 | gwps->display->fillrect(rect->x, rect->y, rect->width, | 224 | gwps->display->fillrect(rect->x, rect->y, rect->width, |
225 | rect->height); | 225 | rect->height); |
226 | #if LCD_DEPTH > 1 | 226 | #if LCD_DEPTH > 1 |
227 | vp->fg_pattern = backup; | 227 | skin_vp->vp.fg_pattern = backup; |
228 | #endif | 228 | #endif |
229 | } | 229 | } |
230 | } | 230 | } |
@@ -585,7 +585,7 @@ static bool skin_render_line(struct skin_element* line, struct skin_draw_info *i | |||
585 | { | 585 | { |
586 | break; | 586 | break; |
587 | } | 587 | } |
588 | if (!do_non_text_tags(info->gwps, info, child, info->skin_vp)) | 588 | if (!do_non_text_tags(info->gwps, info, child)) |
589 | { | 589 | { |
590 | static char tempbuf[128]; | 590 | static char tempbuf[128]; |
591 | const char *valuestr = get_token_value(info->gwps, SKINOFFSETTOPTR(skin_buffer, child->data), | 591 | const char *valuestr = get_token_value(info->gwps, SKINOFFSETTOPTR(skin_buffer, child->data), |