From 2bd8eb8c0b468799109191e63e939ea7bd69f8a1 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Mon, 2 Jan 2017 19:16:33 +0000 Subject: Fix sslcert redraw --- frontends/amiga/corewindow.c | 6 +++--- frontends/amiga/corewindow.h | 6 +++++- frontends/amiga/sslcert.c | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'frontends/amiga') diff --git a/frontends/amiga/corewindow.c b/frontends/amiga/corewindow.c index 052ddd689..38b980a28 100644 --- a/frontends/amiga/corewindow.c +++ b/frontends/amiga/corewindow.c @@ -223,12 +223,12 @@ ami_cw_redraw_rect(struct ami_corewindow *ami_cw, struct rect *r) if(((x + width) - tile_x) < tile_size_x) tile_w = (x + width) - tile_x; - draw_rect.x0 = - tile_x; - draw_rect.y0 = - tile_y; + draw_rect.x0 = tile_x; // was - + draw_rect.y0 = tile_y; // was - draw_rect.x1 = tile_x + tile_w; draw_rect.y1 = tile_y + tile_h; - ami_cw->draw(ami_cw, &draw_rect, &ctx); + ami_cw->draw(ami_cw, -tile_x, -tile_y, &draw_rect, &ctx); #ifdef __amigaos4__ BltBitMapTags(BLITA_SrcType, BLITT_BITMAP, diff --git a/frontends/amiga/corewindow.h b/frontends/amiga/corewindow.h index ba754d6df..8d93882d7 100644 --- a/frontends/amiga/corewindow.h +++ b/frontends/amiga/corewindow.h @@ -81,10 +81,14 @@ struct ami_corewindow { * callback to draw on drawable area of Amiga core window * * \param ami_cw The Amiga core window structure. + * \param x Plot origin (X) + * \param r Plot origin (Y) * \param r The rectangle of the window that needs updating. + * \param ctx Redraw context * \return NSERROR_OK on success otherwise apropriate error code */ - nserror (*draw)(struct ami_corewindow *ami_cw, struct rect *r, struct redraw_context *ctx); + nserror (*draw)(struct ami_corewindow *ami_cw, int x, int y, struct rect *r, + struct redraw_context *ctx); /** * callback for keypress on Amiga core window diff --git a/frontends/amiga/sslcert.c b/frontends/amiga/sslcert.c index 4685caee0..d56a1fe13 100644 --- a/frontends/amiga/sslcert.c +++ b/frontends/amiga/sslcert.c @@ -197,14 +197,14 @@ ami_crtvrfy_key(struct ami_corewindow *ami_cw, uint32_t nskey) * \return NSERROR_OK on success otherwise apropriate error code */ static nserror -ami_crtvrfy_draw(struct ami_corewindow *ami_cw, struct rect *r, struct redraw_context *ctx) +ami_crtvrfy_draw(struct ami_corewindow *ami_cw, int x, int y, struct rect *r, struct redraw_context *ctx) { struct ami_crtvrfy_window *crtvrfy_win; /* technically degenerate container of */ crtvrfy_win = (struct ami_crtvrfy_window *)ami_cw; - sslcert_viewer_redraw(crtvrfy_win->ssl_data, 0, 0, r, ctx); + sslcert_viewer_redraw(crtvrfy_win->ssl_data, x, y, r, ctx); return NSERROR_OK; } -- cgit v1.2.3