From fe7921a387c5a71c8ecba7bb605679b7dab4b86f Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sun, 13 Feb 2011 22:25:11 +0000 Subject: Pass clip rect as struct through content_redraw api. Update the front ends to use this. Note only RO build tested. svn path=/trunk/netsurf/; revision=11670 --- amiga/icon.c | 3 +-- amiga/icon.h | 5 +++-- amiga/thumbnail.c | 9 +++++++-- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'amiga') diff --git a/amiga/icon.c b/amiga/icon.c index 8f230b691..711144de5 100644 --- a/amiga/icon.c +++ b/amiga/icon.c @@ -188,8 +188,7 @@ void amiga_icon_destroy(struct content *c) */ bool amiga_icon_redraw(struct content *c, int x, int y, - int width, int height, - int clip_x0, int clip_y0, int clip_x1, int clip_y1, + int width, int height, struct rect *clip, float scale, colour background_colour) { return plot.bitmap(x, y, width, height, diff --git a/amiga/icon.h b/amiga/icon.h index a89cbdfb0..f7d9e6384 100644 --- a/amiga/icon.h +++ b/amiga/icon.h @@ -29,6 +29,8 @@ #include #include "content/hlcache.h" +struct rect; + struct content_amiga_icon_data { /* empty */ }; @@ -36,8 +38,7 @@ struct content_amiga_icon_data { bool amiga_icon_convert(struct content *c); void amiga_icon_destroy(struct content *c); bool amiga_icon_redraw(struct content *c, int x, int y, - int width, int height, - int clip_x0, int clip_y0, int clip_x1, int clip_y1, + int width, int height, struct rect *clip, float scale, colour background_colour); bool amiga_icon_clone(const struct content *old, struct content *new_content); diff --git a/amiga/thumbnail.c b/amiga/thumbnail.c index 5d10d3e0c..44bd985cb 100755 --- a/amiga/thumbnail.c +++ b/amiga/thumbnail.c @@ -36,6 +36,12 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap, const char *url) { struct BitScaleArgs bsa; + struct rect clip; + + clip.x0 = 0; + clip.y0 = 0; + clip.x1 = content_get_width(content); + clip.y1 = content_get_width(content); bitmap->nativebm = p96AllocBitMap(bitmap->width, bitmap->height, 32, BMF_CLEAR | BMF_DISPLAYABLE | BMF_INTERLEAVED, @@ -47,8 +53,7 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap, current_redraw_browser = curbw; plot = amiplot; content_redraw(content, 0, 0, content_get_width(content), - content_get_width(content), 0, 0, content_get_width(content), - content_get_width(content), 1.0, 0xFFFFFF); + content_get_width(content), &clip, 1.0, 0xFFFFFF); current_redraw_browser = NULL; if(GfxBase->LibNode.lib_Version >= 53) // AutoDoc says v52, but this function isn't in OS4.0, so checking for v53 (OS4.1) -- cgit v1.2.3