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

diff --git a/libs/canvas/image.cc b/libs/canvas/image.cc
index b13859aeda..46cadd0d1c 100644
--- a/libs/canvas/image.cc
+++ b/libs/canvas/image.cc
@@ -22,8 +22,18 @@
 
 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)
+	, _need_render (false)
+{
+	DataReady.connect (data_connections, MISSING_INVALIDATOR, boost::bind (&Image::accept_data, this), gui_context());
+}
+
+Image::Image (Item* parent, Cairo::Format fmt, int width, int height)
+	: Item (parent)
 	, _format (fmt)
 	, _width (width)
 	, _height (height)
@@ -43,10 +53,13 @@ Image::render (Rect const& area, Cairo::RefPtr<Cairo::Context> context) const
 							_pending->stride);
 		_current = _pending;
 	}
+	
+	Rect self = item_to_window (Rect (0, 0, _width, _height));
+	boost::optional<Rect> draw = self.intersection (area);
 
-	if (_surface) {
-		context->set_source (_surface, 0, 0);
-		context->rectangle (area.x0, area.y0, area.width(), area.height());
+	if (_surface && draw) {
+		context->set_source (_surface, self.x0, self.y0);
+		context->rectangle (draw->x0, draw->y0, draw->width(), draw->height());
 		context->fill ();
 	}
 }