X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=553d5511bebe41a5bf1171625fb1b47e1b2ccb03;hb=9bc9b6fa13f9ab0c2bf1cdface47aed0dcc123d1;hp=e456a03c433fd09a275764df9e23979745011a59;hpb=f4ed8dcedceaba2eca469b4d4ab8bc216116ad98;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
index e456a03..553d551 100644
--- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
@@ -212,6 +212,8 @@ Layer_PasteCanvas::set_sub_canvas(etl::handle<synfig::Canvas> x)
 
 	child_changed_connection.disconnect();
 
+	if (canvas != x) signal_subcanvas_changed()();
+
 	canvas=x;
 
 	/*if(canvas)
@@ -241,6 +243,24 @@ Layer_PasteCanvas::set_sub_canvas(etl::handle<synfig::Canvas> x)
 		on_canvas_set();
 }
 
+// when a pastecanvas that contains another pastecanvas is copy/pasted
+// from one document to another, only the outermost pastecanvas was
+// getting its renddesc set to match that of its new parent.  this
+// function is used to recurse through the pastecanvas copying its
+// renddesc to any pastecanvases it contains (bug #2116947, svn r2200)
+void
+Layer_PasteCanvas::update_renddesc()
+{
+	if(!get_canvas() || !canvas || !canvas->is_inline()) return;
+
+	canvas->rend_desc()=get_canvas()->rend_desc();
+	for (Context context = canvas->get_context(); !context->empty(); context++)
+	{
+		etl::handle<Layer_PasteCanvas> paste = etl::handle<Layer_PasteCanvas>::cast_dynamic(*context);
+		if (paste) paste->update_renddesc();
+	}
+}
+
 // This is called whenever the parent canvas gets set/changed
 void
 Layer_PasteCanvas::on_canvas_set()
@@ -393,7 +413,7 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
 		if (blend_method==Color::BLEND_COMPOSITE) blend_using_straight = true;
 	}
 
-	if (!etl::intersect(context.get_full_bounding_rect(),full_bounding_rect+origin))
+	if (!etl::intersect(context.get_full_bounding_rect(),(full_bounding_rect-canvas->rend_desc().get_focus())*exp(zoom)+origin+canvas->rend_desc().get_focus()))
 	{
 		// if there's no intersection between the context and our
 		// surface, and we're rendering 'onto', then we're done