fix copy/paste bug (fixes #640)

synfig · Oct 14, 2019 · 0ea095f · 0ea095f
1 parent d6407d0
commit 0ea095f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/synfig-core/src/modules/lyr_freetype/lyr_freetype.cpp b/synfig-core/src/modules/lyr_freetype/lyr_freetype.cpp
@@ -141,6 +141,7 @@ Layer_Freetype::~Layer_Freetype()
 void
 Layer_Freetype::on_canvas_set()
 {
+	Layer_Composite::on_canvas_set();
 	synfig::String family=param_family.get(synfig::String());
 	int style=param_style.get(int());
 	int weight=param_weight.get(int());

diff --git a/synfig-core/src/modules/lyr_std/import.cpp b/synfig-core/src/modules/lyr_std/import.cpp
@@ -90,6 +90,7 @@ Import::~Import()
 void
 Import::on_canvas_set()
 {
+	Layer_Bitmap::on_canvas_set();
 	if(get_canvas())set_param("filename",param_filename);
 }
 

diff --git a/synfig-core/src/synfig/layer.cpp b/synfig-core/src/synfig/layer.cpp
@@ -229,7 +229,13 @@ synfig::Layer::set_canvas(etl::loose_handle<Canvas> x)
 
 void
 synfig::Layer::on_canvas_set()
-	{ }
+{
+	// update canvas for all non-exported child ValueNodes
+	if (get_canvas())
+		for(DynamicParamList::const_iterator i = dynamic_param_list().begin(); i != dynamic_param_list().end(); ++i)
+			if (!i->second->is_exported())
+				i->second->set_parent_canvas(get_canvas());
+}
 
 void
 synfig::Layer::on_static_param_changed(const String & /* param */)

diff --git a/synfig-core/src/synfig/layers/layer_pastecanvas.cpp b/synfig-core/src/synfig/layers/layer_pastecanvas.cpp
@@ -283,9 +283,8 @@ void
 Layer_PasteCanvas::on_canvas_set()
 {
 	if(get_canvas() && sub_canvas && sub_canvas->is_inline() && sub_canvas->parent()!=get_canvas())
-	{
 		sub_canvas->set_inline(get_canvas());
-	}
+	Layer_Composite::on_canvas_set();
 }
 
 ValueBase