From ef24e5ce9ef10d121c6ab95c2a124a71f5943998 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sat, 26 Oct 2013 19:44:21 +0100 Subject: Fix bitmap offsets in direct render mode by forcing use of BltBitMap --- amiga/plotters.c | 3 ++- amiga/tree.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/amiga/plotters.c b/amiga/plotters.c index 42b523911..6683fc58b 100755 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -690,7 +690,8 @@ static bool ami_bitmap(int x, int y, int width, int height, struct bitmap *bitma LOG(("[ami_plotter] ami_bitmap() got native bitmap")); #endif - if((GfxBase->LibNode.lib_Version >= 53) && (palette_mapped == false)) + if((GfxBase->LibNode.lib_Version >= 53) && (palette_mapped == false) && + (nsoption_bool(direct_render) == false)) { #ifdef __amigaos4__ uint32 comptype = COMPOSITE_Src_Over_Dest; diff --git a/amiga/tree.c b/amiga/tree.c index 28eebcb9c..8cd155b0b 100644 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -1272,8 +1272,9 @@ static void ami_tree_redraw_req_dr(void *p) y = pos_y; } - tree_draw(twin->tree, - x, - y, - bbox->Left, bbox->Top, width, height, &ctx); + tree_draw(twin->tree, 0 - pos_x, 0 - pos_y, + atrr_data->x, atrr_data->y, + atrr_data->width, atrr_data->height, &ctx); FreeVec(atrr_data); ami_update_pointer(twin->win, GUI_POINTER_DEFAULT); -- cgit v1.2.3