X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fpolygon.cc;h=fdc1061d743dd3c201367f50a740f720ff468251;hb=065c6d813e6aac7fa216121be1b15ab6f1ca2892;hp=37046f4d4a6f7ac7a83a24a4b1a9767a76d6c559;hpb=59da788793186d90c30b10654bcfd4d20a7d6eb3;p=ardour.git

diff --git a/libs/canvas/polygon.cc b/libs/canvas/polygon.cc
index 37046f4d4a..fdc1061d74 100644
--- a/libs/canvas/polygon.cc
+++ b/libs/canvas/polygon.cc
@@ -21,15 +21,20 @@
 
 using namespace ArdourCanvas;
 
-Polygon::Polygon (Group* parent)
-	: Item (parent)
-	, PolyItem (parent)
-	, Fill (parent)
+Polygon::Polygon (Canvas* c)
+	: PolyItem (c)
 	, multiple (0)
 	, constant (0)
 	, cached_size (0)
 {
+}
 
+Polygon::Polygon (Item* parent)
+	: PolyItem (parent)
+	, multiple (0)
+	, constant (0)
+	, cached_size (0)
+{
 }
 
 Polygon::~Polygon ()
@@ -41,17 +46,24 @@ Polygon::~Polygon ()
 void
 Polygon::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
 {
-	if (_outline) {
-		setup_outline_context (context);
+	if (_outline || _fill) {
 		render_path (area, context);
 		
 		if (!_points.empty ()) {
 			/* close path */
 			Duple p = item_to_window (Duple (_points.front().x, _points.front().y));
-			context->move_to (p.x, p.y);
+			context->line_to (p.x, p.y);
 		}
 
-		context->stroke_preserve ();
+	}
+
+	if (_outline) {
+		setup_outline_context (context);
+		if (_fill) {
+			context->stroke_preserve ();
+		} else {
+			context->stroke ();
+		}
 	}
 
 	if (_fill) {
@@ -96,7 +108,7 @@ Polygon::cache_shape_computation () const
 bool 
 Polygon::covers (Duple const & point) const
 {
-	Duple p = canvas_to_item (point);
+	Duple p = window_to_item (point);
 
 	Points::size_type npoints = _points.size();
 
@@ -118,7 +130,7 @@ Polygon::covers (Duple const & point) const
 		}
 		j = i; 
 	}
-	
+
 	return oddNodes; 
 }