X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fimage.cc;h=b42c7053a88267e586c445ca6dbc62ef73a4b2d6;hb=b6c80153c3b0306514673202bc6dd611b8a02b3e;hp=b13859aeda270882ab4adfc17e6eee9b2e0f4d94;hpb=31d234b48c36bddb4d5228a3abee9c4419403879;p=ardour.git

diff --git a/libs/canvas/image.cc b/libs/canvas/image.cc
index b13859aeda..b42c7053a8 100644
--- a/libs/canvas/image.cc
+++ b/libs/canvas/image.cc
@@ -22,8 +22,8 @@
 
 using namespace ArdourCanvas;
 
-Image::Image (Group* group, Cairo::Format fmt, int width, int height)
-	: Item (group)
+Image::Image (Canvas* canvas, Cairo::Format fmt, int width, int height)
+	: Item (canvas)
 	, _format (fmt)
 	, _width (width)
 	, _height (height)
@@ -32,7 +32,17 @@ Image::Image (Group* group, Cairo::Format fmt, int width, int height)
 	DataReady.connect (data_connections, MISSING_INVALIDATOR, boost::bind (&Image::accept_data, this), gui_context());
 }
 
-void 
+Image::Image (Item* parent, Cairo::Format fmt, int width, int height)
+	: Item (parent)
+	, _format (fmt)
+	, _width (width)
+	, _height (height)
+	, _need_render (false)
+{
+	DataReady.connect (data_connections, MISSING_INVALIDATOR, boost::bind (&Image::accept_data, this), gui_context());
+}
+
+void
 Image::render (Rect const& area, Cairo::RefPtr<Cairo::Context> context) const
 {
 	if (_need_render && _pending) {
@@ -44,9 +54,12 @@ Image::render (Rect const& area, Cairo::RefPtr<Cairo::Context> context) const
 		_current = _pending;
 	}
 
-	if (_surface) {
-		context->set_source (_surface, 0, 0);
-		context->rectangle (area.x0, area.y0, area.width(), area.height());
+	Rect self = item_to_window (Rect (0, 0, _width, _height));
+	boost::optional<Rect> draw = self.intersection (area);
+
+	if (_surface && draw) {
+		context->set_source (_surface, self.x0, self.y0);
+		context->rectangle (draw->x0, draw->y0, draw->width(), draw->height());
 		context->fill ();
 	}
 }
@@ -83,12 +96,12 @@ Image::put_image (boost::shared_ptr<Data> d)
 }
 
 void
-Image::accept_data () 
+Image::accept_data ()
 {
 	/* must be executed in gui thread */
 
 	begin_change ();
 	_need_render = true;
 	end_change (); // notify canvas that we need redrawing
-}	     
+}