diff options
Diffstat (limited to 'amiga')
| -rwxr-xr-x | amiga/history_local.c | 6 | ||||
| -rwxr-xr-x | amiga/plotters.c | 21 | ||||
| -rwxr-xr-x | amiga/tree.c | 2 |
3 files changed, 9 insertions, 20 deletions
diff --git a/amiga/history_local.c b/amiga/history_local.c index 01897fb82..e37a500c6 100755 --- a/amiga/history_local.c +++ b/amiga/history_local.c @@ -40,7 +40,7 @@ #include <intuition/icclass.h> #include <proto/utility.h> #include "utils/messages.h" -#include "amiga/plotters.h" +#include "graphics/rpattr.h" #include <proto/window.h> #include <proto/space.h> @@ -163,7 +163,9 @@ void ami_history_redraw(struct history_window *hw) GetAttr(SCROLLER_Top,hw->objects[OID_VSCROLL],(ULONG *)&ys); glob = &hw->gg; - ami_clg(0xffffff); + + SetRPAttrs(&glob->rp, RPTAG_APenColor, 0xffffffff, TAG_DONE); + RectFill(&glob->rp, 0, 0, bbox->Width - 1, bbox->Height - 1); history_redraw_rectangle(history_current, xs, ys, bbox->Width + xs, bbox->Height + ys, 0, 0); diff --git a/amiga/plotters.c b/amiga/plotters.c index 9c61ad259..76ab88303 100755 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -175,19 +175,6 @@ void ami_free_layers(struct gui_globals *gg) FreeVec(gg->areabuf); } -bool ami_clg(colour c) -{ - p96RectFill(&glob->rp,0,0,scrn->Width-1,scrn->Width-1, - p96EncodeColor(RGBFB_A8B8G8R8,c)); -/* - SetRPAttrs(&glob->rp,RPTAG_BPenColor,p96EncodeColor(RGBFB_A8B8G8R8,c), - TAG_DONE); - Move(&glob->rp,0,0); - ClearScreen(&glob->rp); -*/ - return true; -} - void ami_clearclipreg(struct gui_globals *gg) { struct Region *reg = NULL; @@ -207,11 +194,13 @@ bool ami_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style) LOG(("[ami_plotter] Entered ami_rectangle()")); #endif - if (style->fill_type != PLOT_OP_TYPE_NONE) { + if (style->fill_type != PLOT_OP_TYPE_NONE) { #ifndef NS_AMIGA_CAIRO_ALL - p96RectFill(&glob->rp,x0,y0,x1-1,y1-1, - p96EncodeColor(RGBFB_A8B8G8R8, style->fill_colour)); + SetRPAttrs(&glob->rp, RPTAG_APenColor, + p96EncodeColor(RGBFB_A8B8G8R8, style->fill_colour), + TAG_DONE); + RectFill(&glob->rp, x0, y0, x1-1, y1-1); #else ami_cairo_set_colour(glob->cr, style->fill_colour); ami_cairo_set_solid(glob->cr); diff --git a/amiga/tree.c b/amiga/tree.c index 44ff43121..c474a99bd 100755 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -1249,8 +1249,6 @@ void ami_tree_redraw_request(int x, int y, int width, int height, void *data) if(x - pos_x + width > bbox->Width) width = bbox->Width - (x - pos_x); if(y - pos_y + height > bbox->Height) height = bbox->Height - (y - pos_y); - ami_clg(0xffffffff); - tree_draw(twin->tree, -pos_x, -pos_y, x, y, width, height); BltBitMapRastPort(twin->globals.bm, x - pos_x, y - pos_y, twin->win->RPort, |