From 3128ecf2a5c94102e0e1659f947a345d36750afe Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Tue, 28 Jun 2011 20:17:39 +0000 Subject: Unify content_redraw params in content_redraw_data struct. Core and RISC OS content handlers updated. svn path=/trunk/netsurf/; revision=12529 --- riscos/gui/url_bar.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'riscos/gui/url_bar.c') diff --git a/riscos/gui/url_bar.c b/riscos/gui/url_bar.c index ba9ab4533..d92e8fc8d 100644 --- a/riscos/gui/url_bar.c +++ b/riscos/gui/url_bar.c @@ -581,6 +581,8 @@ void ro_gui_url_bar_redraw(struct url_bar *url_bar, wimp_draw *redraw) xwimp_plot_icon(&icon); } else { + struct content_redraw_data data; + xwimp_set_colour(wimp_COLOUR_WHITE); xos_plot(os_MOVE_TO, (redraw->box.x0 - redraw->xscroll) + @@ -598,13 +600,18 @@ void ro_gui_url_bar_redraw(struct url_bar *url_bar, wimp_draw *redraw) clip.x1 = (redraw->clip.x1 - ro_plot_origin_x) / 2; clip.y1 = (ro_plot_origin_y - redraw->clip.y1) / 2; - content_redraw(url_bar->favicon_content, - (url_bar->favicon_extent.x0 + - url_bar->favicon_offset.x) / 2, - (url_bar->favicon_offset.y - - url_bar->favicon_extent.y1) / 2, - url_bar->favicon_width, url_bar->favicon_height, - &clip, 1, 0, false, false); + data.x = (url_bar->favicon_extent.x0 + + url_bar->favicon_offset.x) / 2; + data.y = (url_bar->favicon_offset.y - + url_bar->favicon_extent.y1) / 2; + data.width = url_bar->favicon_width; + data.height = url_bar->favicon_height; + data.background_colour = 0xFFFFFF; + data.scale = 1; + data.repeat_x = false; + data.repeat_y = false; + + content_redraw(url_bar->favicon_content, &data, &clip); } } -- cgit v1.2.3