X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fpoly_line.cc;h=99c3377874ada0463461c24bd341cba224031fff;hb=6f019faaa0c3875040ec608f30b09832daa5bc87;hp=3150907db6f17aec5fec9f16e362444bac54ff99;hpb=f190e630ab2b3d2ff1f7c8640a7d4a072ea3437e;p=ardour.git

diff --git a/libs/canvas/poly_line.cc b/libs/canvas/poly_line.cc
index 3150907db6..99c3377874 100644
--- a/libs/canvas/poly_line.cc
+++ b/libs/canvas/poly_line.cc
@@ -28,18 +28,66 @@ using namespace ArdourCanvas;
 PolyLine::PolyLine (Canvas* c)
 	: PolyItem (c)
 	, _threshold (1.0)
+	, _y1 (0)
 {
 }
 
 PolyLine::PolyLine (Item* parent)
 	: PolyItem (parent)
 	, _threshold (1.0)
+	, _y1 (0)
 {
 }
 
+void
+PolyLine::compute_bounding_box () const
+{
+	PolyItem::compute_bounding_box ();
+	if (_y1 > 0 && _bounding_box) {
+		_bounding_box.x0 = 0;
+		_bounding_box.x1 = COORD_MAX;
+		if (_y1 > _bounding_box.y1) {
+			_bounding_box.y1 = _y1;
+		}
+	}
+}
+
+void
+PolyLine::set_fill_y1 (double y1) {
+	begin_change ();
+	_bounding_box_dirty = true;
+	_y1 = y1;
+	end_change ();
+}
+
 void
 PolyLine::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
 {
+	if (_fill && _y1 > 0 && _points.size() > 0) {
+		const ArdourCanvas::Rect& vp (_canvas->visible_area());
+		setup_fill_context (context);
+
+		Duple y (0, _y1);
+		float y1 = item_to_window (y).y;
+		render_path (area, context);
+		Duple c0 (item_to_window (_points.back()));
+		Duple c1 (item_to_window (_points.front()));
+		if (c0.x < vp.x1) {
+			context->line_to (vp.x1, c0.y);
+			context->line_to (vp.x1, y1);
+		} else {
+			context->line_to (vp.x1, y1);
+		}
+		if (c1.x > vp.x0) {
+			context->line_to (vp.x0, y1);
+			context->line_to (vp.x0, c1.y);
+		} else {
+			context->line_to (vp.x0, y1);
+		}
+		context->close_path ();
+		context->fill ();
+	}
+
 	if (_outline) {
 		setup_outline_context (context);
 		render_path (area, context);
@@ -77,7 +125,7 @@ PolyLine::covers (Duple const & point) const
 	Duple p = window_to_item (point);
 
 	const Points::size_type npoints = _points.size();
-	
+
 	if (npoints < 2) {
 		return false;
 	}
@@ -95,30 +143,30 @@ PolyLine::covers (Duple const & point) const
 		double t;
 		Duple a (_points[j]);
 		Duple b (_points[i]);
-		
+
 		/*
 		  Clamp the line endpoints to the visible area of the canvas. If we do
 		  not do this, we may have a line segment extending to COORD_MAX and our
 		  math goes wrong.
 		*/
-		
+
 		a.x = std::min (a.x, visible.x1);
 		a.y = std::min (a.y, visible.y1);
 		b.x = std::min (b.x, visible.x1);
 		b.y = std::min (b.y, visible.y1);
-		
+
 		double d = distance_to_segment_squared (p, a, b, t, at);
-		
+
 		if (t < 0.0 || t > 1.0) {
 			continue;
 		}
-		
+
 		if (d < _threshold + _outline_width) {
 			return true;
 		}
-		
+
 	}
-	
+
 	return false;
 }