X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Flayer_pastecanvas.cpp;h=2181a834d6577bbd1506b4a7244023787be21ab5;hb=d243d7ecee75cc386a751c79ce7085e92afcbf27;hp=733e7fe655625f4fd459fb8f494d19bc305d3a97;hpb=79520f781b362e36426241f46a65c4a1855660f4;p=synfig.git diff --git a/synfig-core/src/synfig/layer_pastecanvas.cpp b/synfig-core/src/synfig/layer_pastecanvas.cpp index 733e7fe..2181a83 100644 --- a/synfig-core/src/synfig/layer_pastecanvas.cpp +++ b/synfig-core/src/synfig/layer_pastecanvas.cpp @@ -87,17 +87,14 @@ Layer_PasteCanvas::Layer_PasteCanvas(): depth(0), zoom(0), time_offset(0), - extra_reference(false), - origin_static(false), - focus_static(false), - canvas_static(false), - zoom_static(false), - offset_static(false), - children_lock_static(true) + extra_reference(false) { children_lock=false; muck_with_time_=true; curr_time=Time::begin(); + Layer::Vocab voc(get_param_vocab()); + Layer::fill_static(voc); + set_param_static("children_lock", true); } Layer_PasteCanvas::~Layer_PasteCanvas() @@ -145,10 +142,12 @@ Layer_PasteCanvas::get_param_vocab()const ret.push_back(ParamDesc("time_offset") .set_local_name(_("Time Offset")) + .set_description(_("Time Offset to apply to the context")) ); ret.push_back(ParamDesc("children_lock") .set_local_name(_("Children Lock")) + .set_description(_("When checked prevents to select the children using the mouse click")) ); ret.push_back(ParamDesc("focus") @@ -184,9 +183,9 @@ Layer_PasteCanvas::set_param(const String & param, const ValueBase &value) if(param=="canvas" && value.same_type_as(Canvas::Handle())) { set_sub_canvas(value.get(Canvas::Handle())); + set_param_static(param, value.get_static()); return true; } - //! \todo this introduces bug 1844764 if enabled; it was introduced in r954. // http://synfig.org/images/3/3d/Moving-waypoints.sifz is an // example of an animation that has its waypoints displayed @@ -576,13 +575,6 @@ void Layer_PasteCanvas::get_times_vfunc(Node::time_set &set) const bool Layer_PasteCanvas::set_param_static(const String ¶m, const bool x) { - SET_STATIC(origin, x) - SET_STATIC(focus, x) - SET_STATIC(canvas, x) - SET_STATIC(zoom, x) - SET_STATIC(offset, x) - SET_STATIC(children_lock, x) - return Layer_Composite::set_param_static(param, x); } @@ -590,12 +582,5 @@ Layer_PasteCanvas::set_param_static(const String ¶m, const bool x) bool Layer_PasteCanvas::get_param_static(const String ¶m) const { - GET_STATIC(origin) - GET_STATIC(focus) - GET_STATIC(canvas) - GET_STATIC(zoom) - GET_STATIC(offset) - GET_STATIC(children_lock) - return Layer_Composite::get_param_static(param); }