X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fduckmatic.cpp;h=75212d4dbe1e7f43c62d23c8bdf835833169b9be;hb=c2e1e65c0f837dcdd34cf39a097ea85a4741c149;hp=15ee0c9b5b529de791be039bfd2e2bf4341bead8;hpb=41063fc828642a7ae12aeb50694f1cd4580eb467;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp index 15ee0c9..75212d4 100644 --- a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp +++ b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp @@ -1695,13 +1695,22 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleget_contained_type()==ValueBase::TYPE_VECTOR) { Bezier bezier; + etl::handle first_duck, duck; + int first = -1; for(i=0;ilink_count();i++) { if(!value_node->list[i].status_at_time(get_time())) continue; if(!add_to_ducks(synfigapp::ValueDesc(value_node,i),canvas_view,transform_stack)) return false; - etl::handle duck(last_duck()); + duck = last_duck(); + + // remember the index of the first vertex we didn't skip + if (first == -1) + { + first = i; + first_duck = duck; + } if(param_desc) { @@ -1720,7 +1729,7 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handle0) + if (first != i) { handle bezier_(new Bezier()); bezier_->p1=bezier.p1; @@ -1736,6 +1745,27 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleget_loop() && first != -1 && first_duck != duck) + { + duck = first_duck; + + bezier.p1=bezier.p2;bezier.c1=bezier.c2; + bezier.p2=bezier.c2=duck; + + handle bezier_(new Bezier()); + bezier_->p1=bezier.p1; + bezier_->c1=bezier.c1; + bezier_->p2=bezier.p2; + bezier_->c2=bezier.c2; + add_bezier(bezier_); + last_bezier()->signal_user_click(2).connect( + sigc::bind( + sigc::mem_fun( + *canvas_view, + &studio::CanvasView::popup_param_menu_bezier), + synfigapp::ValueDesc(value_node,first))); + } } /*else if(value_node->get_contained_type()==ValueBase::TYPE_SEGMENT) {