X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=7d8fbea22eb25d9f64760d59251a18e6e9bed772;hb=63e709f66d50c124cc0ece2325f4773ac4ae7b20;hp=026a1136d0e170a4183c65e83138d8701ae31bba;hpb=270dcc01eeac566f8543d40827664c54e9b7ebaf;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
index 026a113..7d8fbea 100644
--- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
@@ -1,6 +1,6 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file layer_pastecanvas.cpp
-**	\brief Template Header
+**	\brief Implementation of the "Paste Canvas" layer
 **
 **	$Id$
 **
@@ -71,8 +71,8 @@ public:
 
 SYNFIG_LAYER_INIT(Layer_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,_("Other"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Layer_PasteCanvas,N_("Paste Canvas"));
+SYNFIG_LAYER_SET_CATEGORY(Layer_PasteCanvas,N_("Other"));
 SYNFIG_LAYER_SET_VERSION(Layer_PasteCanvas,"0.1");
 SYNFIG_LAYER_SET_CVS_ID(Layer_PasteCanvas,"$Id$");
 
@@ -147,16 +147,32 @@ Layer_PasteCanvas::set_param(const String & param, const ValueBase &value)
 {
 	IMPORT(origin);
 
+	// IMPORT(canvas);
 	if(param=="canvas" && value.same_type_as(Canvas::Handle()))
 	{
 		set_sub_canvas(value.get(Canvas::Handle()));
 		return true;
 	}
 
-//	IMPORT(canvas);
+	//! \todo this introduces bug 1844764 if enabled; it was introduced in r954, but I can't see if it's useful
+#if 0
+	if (param=="time_offset" && value.same_type_as(time_offset))
+	{
+		if (time_offset != value.get(Time()))
+		{
+			value.put(&time_offset);
+			// notify that the time_offset has changed so we can update the
+			// waypoint positions in parent layers
+			changed();
+		}
+		return true;
+	}
+#else
+	IMPORT(time_offset);
+#endif
+
 	IMPORT(children_lock);
 	IMPORT(zoom);
-	IMPORT(time_offset);
 
 	return Layer_Composite::set_param(param,value);
 }
@@ -281,7 +297,6 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
 
 	if(depth==MAX_DEPTH)
 	{
-		DEBUGPOINT();
 		// if we are at the extent of our depth,
 		// then we should just return whatever is under us.
 		return context.accelerated_render(surface,quality,renddesc,cb);
@@ -410,16 +425,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);
 }