X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fduckmatic.cpp;h=15ee0c9b5b529de791be039bfd2e2bf4341bead8;hb=7b2407f8f85a0968348357ee004815065e58a802;hp=a477fed43ac228ddf329c68c6ee39b765be4fd90;hpb=9ac68847d4da5e243b7a3da57f48604ad4f6a50d;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp index a477fed..15ee0c9 100644 --- a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp +++ b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp @@ -108,18 +108,6 @@ Duckmatic::~Duckmatic() } void -Duckmatic::set_flip_x(bool flip_x) -{ - flip_x_ = flip_x; -} - -void -Duckmatic::set_flip_y(bool flip_y) -{ - flip_y_ = flip_y; -} - -void Duckmatic::clear_ducks() { duck_data_share_map.clear(); @@ -286,6 +274,8 @@ Duckmatic::select_all_ducks() for(iter=duck_map.begin();iter!=duck_map.end();++iter) if(is_duck_group_selectable(iter->second)) select_duck(iter->second); + else + unselect_duck(iter->second); } void @@ -562,12 +552,12 @@ Duckmatic::signal_edited_selected_ducks() Point point((*iter)->get_point()); bool changed = false; - if (point[0] * (flip_x_ ? -1 : 1) < 0) + if (point[0] < 0) { point[0] = 0; changed = true; } - if (point[1] * (flip_y_ ? -1 : 1) < 0) + if (point[1] < 0) { point[1] = 0; changed = true; @@ -1034,8 +1024,8 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_radius(true); duck->set_type(Duck::TYPE_RADIUS); - // put the duck on the right hand side of the center, whether the display is flipped or not - duck->set_point(Point(value_desc.get_value(get_time()).get(Real()) * (flip_x_ ? -1 : 1), 0)); + // put the duck on the right hand side of the center + duck->set_point(Point(value_desc.get_value(get_time()).get(Real()), 0)); duck->set_name(guid_string(value_desc)); if(value_desc.is_value_node()) { @@ -1620,8 +1610,8 @@ Duckmatic::add_to_ducks(const synfigapp::ValueDesc& value_desc,etl::handleset_value_desc(synfigapp::ValueDesc(value_node,0)); + synfigapp::ValueDesc(value_node,i))); + duck->set_value_desc(synfigapp::ValueDesc(value_node,i)); }