X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=026a1136d0e170a4183c65e83138d8701ae31bba;hb=99b75ef1bb279e2314516f922f05696263d5bd27;hp=839475eab63605f0d28011ea6cf687d9e14c0521;hpb=5ddcf36f04cfbd10fabda4e3c5633cb27cdd4c0a;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
index 839475e..026a113 100644
--- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
-/*!	\file layer_pastecanvas.h
+/*!	\file layer_pastecanvas.cpp
 **	\brief Template Header
 **
-**	$Id: layer_pastecanvas.cpp,v 1.3 2005/01/24 03:08:18 darco Exp $
+**	$Id$
 **
 **	\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,11 +70,11 @@ 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: layer_pastecanvas.cpp,v 1.3 2005/01/24 03:08:18 darco Exp $");
+SYNFIG_LAYER_SET_CVS_ID(Layer_PasteCanvas,"$Id$");
 
 /* === M E T H O D S ======================================================= */
 
@@ -84,7 +85,7 @@ Layer_PasteCanvas::Layer_PasteCanvas():
 	time_offset(0)
 {
 	children_lock=false;
-	do_not_muck_with_time_=false;
+	muck_with_time_=true;
 	curr_time=Time::begin();
 }
 
@@ -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;
@@ -163,7 +164,7 @@ Layer_PasteCanvas::set_param(const String & param, const ValueBase &value)
 void
 Layer_PasteCanvas::set_sub_canvas(etl::handle<synfig::Canvas> x)
 {
-	if(canvas && !do_not_muck_with_time_)
+	if(canvas && muck_with_time_)
 		remove_child(canvas.get());
 
 	if(canvas && (canvas->is_inline() || !get_canvas() || get_canvas()->get_root()!=canvas->get_root()))
@@ -184,7 +185,7 @@ Layer_PasteCanvas::set_sub_canvas(etl::handle<synfig::Canvas> x)
 	if(canvas)
 		bounds=(canvas->get_context().get_full_bounding_rect()-canvas->rend_desc().get_focus())*exp(zoom)+origin+canvas->rend_desc().get_focus();
 
-	if(canvas && !do_not_muck_with_time_)
+	if(canvas && muck_with_time_)
 		add_child(canvas.get());
 
 	if(canvas && (canvas->is_inline() || !get_canvas() || get_canvas()->get_root()!=canvas->get_root()))
@@ -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();
 	}
@@ -244,18 +245,19 @@ Layer_PasteCanvas::hit_check(synfig::Context context, const synfig::Point &pos)c
 {
 	if(depth==MAX_DEPTH)return 0;depth_counter counter(depth);
 
-	Point target_pos=(pos-canvas->rend_desc().get_focus()-origin)/exp(zoom)+canvas->rend_desc().get_focus();
+	if (canvas) {
+		Point target_pos=(pos-canvas->rend_desc().get_focus()-origin)/exp(zoom)+canvas->rend_desc().get_focus();
 
-	if(canvas && get_amount() && canvas->get_context().get_color(target_pos).get_a()>=0.25)
-	{
-		if(!children_lock)
+		if(canvas && get_amount() && canvas->get_context().get_color(target_pos).get_a()>=0.25)
 		{
-			return canvas->get_context().hit_check(target_pos);
+			if(!children_lock)
+			{
+				return canvas->get_context().hit_check(target_pos);
+			}
+			return const_cast<Layer_PasteCanvas*>(this);
 		}
-		return const_cast<Layer_PasteCanvas*>(this);
 	}
-	else
-		return context.hit_check(pos);
+	return context.hit_check(pos);
 }
 
 Color
@@ -289,7 +291,7 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
 	if(!canvas || !get_amount())
 		return context.accelerated_render(surface,quality,renddesc,cb);
 
-	if(!do_not_muck_with_time_ && 	curr_time!=Time::begin() && canvas->get_time()!=curr_time+time_offset)
+	if(muck_with_time_ && curr_time!=Time::begin() && canvas->get_time()!=curr_time+time_offset)
 	{
 		canvas->set_time(curr_time+time_offset);
 	}
@@ -357,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;