summaryrefslogtreecommitdiff
path: root/beos/beos_plotters.cpp
diff options
context:
space:
mode:
authorFran├žois Revel <mmu_man@netsurf-browser.org>2008-06-04 01:53:20 +0000
committerFran├žois Revel <mmu_man@netsurf-browser.org>2008-06-04 01:53:20 +0000
commit524e29c4dfcbe713fc25075c9e1c566370062a55 (patch)
tree996eb330d23a3ff78598f259cd48b3cc6c174ee7 /beos/beos_plotters.cpp
parent38be80a680ea5e7403dd39353902a7941e7b0147 (diff)
downloadnetsurf-524e29c4dfcbe713fc25075c9e1c566370062a55.tar.gz
netsurf-524e29c4dfcbe713fc25075c9e1c566370062a55.tar.bz2
- fixed alpha bitmap drawing
- fixed polygon drawing - newstyle throbber, loosely copied from the gtk one. svn path=/trunk/netsurf/; revision=4259
Diffstat (limited to 'beos/beos_plotters.cpp')
-rw-r--r--beos/beos_plotters.cpp40
1 files changed, 37 insertions, 3 deletions
diff --git a/beos/beos_plotters.cpp b/beos/beos_plotters.cpp
index 0cfee16a0..89266d64c 100644
--- a/beos/beos_plotters.cpp
+++ b/beos/beos_plotters.cpp
@@ -107,6 +107,9 @@ const struct plotter_table nsbeos_plotters = {
};
+// #pragma mark - implementation
+
+
BView *nsbeos_current_gc(void)
{
return current_view;
@@ -158,9 +161,14 @@ bool nsbeos_plot_rectangle(int x0, int y0, int width, int height,
nsbeos_set_colour(c);
+ float pensize = view->PenSize();
+ view->SetPenSize(line_width);
+
BRect rect(x0, y0, x0 + width - 1, y0 + height - 1);
view->StrokeRect(rect, pat);
+ view->SetPenSize(pensize);
+
//nsbeos_current_gc_unlock();
#if 0 /* GTK */
@@ -200,10 +208,15 @@ bool nsbeos_plot_line(int x0, int y0, int x1, int y1, int width,
nsbeos_set_colour(c);
+ float pensize = view->PenSize();
+ view->SetPenSize(width);
+
BPoint start(x0, y0);
BPoint end(x1, y1);
view->StrokeLine(start, end, pat);
+ view->SetPenSize(pensize);
+
//nsbeos_current_gc_unlock();
#if 0 /* GTK */
@@ -236,8 +249,20 @@ bool nsbeos_plot_polygon(int *p, unsigned int n, colour fill)
return false;
}
- rgb_color color = nsbeos_rgb_colour(fill);
+ nsbeos_set_colour(fill);
+ BPoint points[n];
+
+ for (i = 0; i < n; i++) {
+ points[i] = BPoint(p[2 * i], p[2 * i + 1]);
+ }
+
+ if (fill == TRANSPARENT)
+ view->StrokePolygon(points, (int32)n);
+ else
+ view->FillPolygon(points, (int32)n);
+
+#if 0
view->BeginLineArray(n);
for (i = 0; i < n; i++) {
@@ -247,6 +272,7 @@ bool nsbeos_plot_polygon(int *p, unsigned int n, colour fill)
}
view->EndLineArray();
+#endif
//nsbeos_current_gc_unlock();
@@ -467,21 +493,29 @@ static bool nsbeos_plot_bbitmap(int x, int y, int width, int height,
}
drawing_mode oldmode = view->DrawingMode();
- view->SetDrawingMode(B_OP_OVER);
+ source_alpha alpha;
+ alpha_function func;
+ view->GetBlendingMode(&alpha, &func);
+ //view->SetDrawingMode(B_OP_OVER);
+ view->SetDrawingMode(B_OP_ALPHA);
+ view->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
// XXX DrawBitmap() resamples if rect doesn't match,
// but doesn't do any filtering
// XXX: use Zeta API if available ?
BRect rect(x, y, x + width - 1, y + height - 1);
+ /*
rgb_color old = view->LowColor();
if (bg != TRANSPARENT) {
view->SetLowColor(nsbeos_rgb_colour(bg));
view->FillRect(rect, B_SOLID_LOW);
}
+ */
view->DrawBitmap(b, rect);
// maybe not needed?
- view->SetLowColor(old);
+ //view->SetLowColor(old);
+ view->SetBlendingMode(alpha, func);
view->SetDrawingMode(oldmode);
//nsbeos_current_gc_unlock();