X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=1857db208ce5b3985fae0db272a4465c1aee7f83;hb=f68aac1f32e9c946b00c3246cd2ae9589d6bb3fa;hp=4cfa76755bea5905a551ef7f04a7f7793424567f;hpb=493e279ad4100cd467b906fd8b3eb106b2cef428;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
index 4cfa767..1857db2 100644
--- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -69,9 +70,9 @@ public:
 /* === G L O B A L S ======================================================= */
 
 SYNFIG_LAYER_INIT(Layer_PasteCanvas);
-SYNFIG_LAYER_SET_NAME(Layer_PasteCanvas,"PasteCanvas");
+SYNFIG_LAYER_SET_NAME(Layer_PasteCanvas,"PasteCanvas"); // todo: use paste_canvas
 SYNFIG_LAYER_SET_LOCAL_NAME(Layer_PasteCanvas,_("Paste Canvas"));
-SYNFIG_LAYER_SET_CATEGORY(Layer_PasteCanvas,_("Default"));
+SYNFIG_LAYER_SET_CATEGORY(Layer_PasteCanvas,_("Other"));
 SYNFIG_LAYER_SET_VERSION(Layer_PasteCanvas,"0.1");
 SYNFIG_LAYER_SET_CVS_ID(Layer_PasteCanvas,"$Id$");
 
@@ -146,7 +147,7 @@ Layer_PasteCanvas::set_param(const String & param, const ValueBase &value)
 {
 	IMPORT(origin);
 
-	if(param=="canvas" && value.same_as(Canvas::Handle()))
+	if(param=="canvas" && value.same_type_as(Canvas::Handle()))
 	{
 		set_sub_canvas(value.get(Canvas::Handle()));
 		return true;
@@ -231,7 +232,7 @@ Layer_PasteCanvas::set_time(Context context, Time time)const
 	context.set_time(time);
 	if(canvas)
 	{
-		canvas->set_time(time);
+		canvas->set_time(time+time_offset);
 
 		bounds=(canvas->get_context().get_full_bounding_rect()-canvas->rend_desc().get_focus())*exp(zoom)+origin+canvas->rend_desc().get_focus();
 	}
@@ -358,7 +359,9 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
 
 		Surface pastesurface;
 
-		if(area.area()<=0.000001 || desc.get_w()==0 || desc.get_h()==0)
+		// \todo this used to also have "area.area()<=0.000001 || " - is it useful?
+		//		 it was causing bug #1809480 (Zoom in beyond 8.75 in nested canvases fails)
+		if(desc.get_w()==0 || desc.get_h()==0)
 		{
 			if(cb && !cb->amount_complete(10000,10000)) return false;
 
@@ -407,16 +410,17 @@ void Layer_PasteCanvas::get_times_vfunc(Node::time_set &set) const
 	Node::time_set tset;
 	if(canvas) tset = canvas->get_times();
 
-	Node::time_set::iterator 	i = tset.begin(),
-									end = tset.end();
+	Node::time_set::iterator i = tset.begin(), end = tset.end();
 
 	//Make sure we offset the time...
-	//TODO: SOMETHING STILL HAS TO BE DONE WITH THE OTHER DIRECTION
-	//		(recursing down the tree needs to take this into account too...)
+	//! \todo: SOMETHING STILL HAS TO BE DONE WITH THE OTHER DIRECTION
+	//		   (recursing down the tree needs to take this into account too...)
 	for(; i != end; ++i)
-	{
-		set.insert(*i + time_offset);
-	}
+		set.insert(*i
+#ifdef ADJUST_WAYPOINTS_FOR_TIME_OFFSET // see node.h
+				   - time_offset
+#endif
+			);
 
 	Layer::get_times_vfunc(set);
 }