X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=9357698e2317747e9b97ae07d4faa99886e7a934;hb=544dd176fa55a0a3a3f35d879f74f0601e46914e;hp=31d3153c848633fc88ba1912d62bf959dadacf4c;hpb=cf0e1e5a13352ba0e07e4a2f53088c7661f73181;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 31d3153..9357698 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -53,6 +53,10 @@
 #include <synfig/valuenode_dynamiclist.h>
 #include <synfig/valuenode_twotone.h>
 #include <synfig/valuenode_stripes.h>
+#include <synfig/valuenode_blinecalctangent.h>
+#include <synfig/valuenode_blinecalcvertex.h>
+#include <synfig/valuenode_blinecalcwidth.h>
+#include <synfig/valuenode_bline.h>
 #include <synfig/layer.h>
 
 #include <synfigapp/uimanager.h>
@@ -2004,6 +2008,7 @@ static bool _close_instance(etl::handle<Instance> instance)
 bool
 CanvasView::close_instance()
 {
+#ifdef SINGLE_THREADED
 	if (get_work_area()->get_updating())
 	{
 		get_work_area()->stop_updating(true); // stop and mark as cancelled
@@ -2014,6 +2019,7 @@ CanvasView::close_instance()
 			250);
 	}
 	else
+#endif
 		Glib::signal_timeout().connect(
 			sigc::bind(sigc::ptr_fun(_close_instance),
 					   (etl::handle<Instance>)get_instance()),
@@ -2157,10 +2163,10 @@ CanvasView::on_layer_toggle(synfig::Layer::Handle layer)
 }
 
 void
-CanvasView::popup_param_menu(synfigapp::ValueDesc value_desc, float location)
+CanvasView::popup_param_menu(synfigapp::ValueDesc value_desc, float location, bool bezier)
 {
 	parammenu.items().clear();
-	get_instance()->make_param_menu(&parammenu,get_canvas(),value_desc,location);
+	get_instance()->make_param_menu(&parammenu,get_canvas(),value_desc,location,bezier);
 
 	parammenu.popup(3,gtk_get_current_event_time());
 }
@@ -2418,6 +2424,7 @@ CanvasView::time_zoom_in()
 	time_window_adjustment().set_page_size(time_window_adjustment().get_page_size()*0.75);
 	if (time_window_adjustment().get_page_size() < min_page_size)
 		time_window_adjustment().set_page_size(min_page_size);
+	time_window_adjustment().set_page_increment(time_window_adjustment().get_page_size());
 	time_window_adjustment().changed();
 
 	refresh_time_window();
@@ -2432,6 +2439,7 @@ CanvasView::time_zoom_out()
 	time_window_adjustment().set_page_size(time_window_adjustment().get_page_size()/0.75);
 	if (time_window_adjustment().get_page_size() > length)
 		time_window_adjustment().set_page_size(length);
+	time_window_adjustment().set_page_increment(time_window_adjustment().get_page_size());
 	time_window_adjustment().changed();
 
 	refresh_time_window();
@@ -2582,12 +2590,57 @@ CanvasView::on_duck_changed(const synfig::Point &value,const synfigapp::ValueDes
 	switch(value_desc.get_value_type())
 	{
 	case ValueBase::TYPE_REAL:
+		if (ValueNode_BLineCalcWidth::Handle bline_width = ValueNode_BLineCalcWidth::Handle::cast_dynamic(value_desc.get_value_node()))
+		{
+			Real old_width((*bline_width)(get_time()).get(Real()));
+			Real new_width(value.mag());
+			int scale_index(bline_width->get_link_index_from_name("scale"));
+			Real scale((*(bline_width->get_link(scale_index)))(get_time()).get(Real()));
+			if (!(canvas_interface()->change_value(synfigapp::ValueDesc(bline_width,scale_index),
+												   new_width * scale / old_width)))
+				return false;
+		}
 		return canvas_interface()->change_value(value_desc,value.mag());
 		break;
 	case ValueBase::TYPE_ANGLE:
 		return canvas_interface()->change_value(value_desc,Angle::tan(value[1],value[0]));
 		break;
-	default:
+	case ValueBase::TYPE_VECTOR:
+		if (ValueNode_BLineCalcTangent::Handle bline_tangent = ValueNode_BLineCalcTangent::Handle::cast_dynamic(value_desc.get_value_node()))
+		{
+			Vector old_tangent = (*bline_tangent)(get_time()).get(Vector());
+			Angle old_angle = old_tangent.angle();
+			Real old_length = old_tangent.mag();
+			Angle new_angle = value.angle();
+			Real new_length = value.mag();
+			int offset_index(bline_tangent->get_link_index_from_name("offset"));
+			int scale_index(bline_tangent->get_link_index_from_name("scale"));
+			int fixed_length_index(bline_tangent->get_link_index_from_name("fixed_length"));
+			Angle old_offset((*(bline_tangent->get_link(offset_index)))(get_time()).get(Angle()));
+			Real scale((*(bline_tangent->get_link(scale_index)))(get_time()).get(Real()));
+			bool fixed_length((*(bline_tangent->get_link(fixed_length_index)))(get_time()).get(bool()));
+			if (fixed_length)
+			{
+				if (!(canvas_interface()->change_value(synfigapp::ValueDesc(bline_tangent,scale_index),
+													   new_length)))
+					return false;
+			}
+			else if (old_length != 0 &&
+					 !(canvas_interface()->change_value(synfigapp::ValueDesc(bline_tangent,scale_index),
+														new_length * scale / old_length)))
+				return false;
+			return canvas_interface()->change_value(synfigapp::ValueDesc(bline_tangent,offset_index), old_offset + new_angle - old_angle);
+		}
+
+		if (ValueNode_BLineCalcVertex::Handle bline_vertex = ValueNode_BLineCalcVertex::Handle::cast_dynamic(value_desc.get_value_node()))
+		{
+			ValueNode_BLine::Handle bline = ValueNode_BLine::Handle::cast_dynamic(bline_vertex->get_link(bline_vertex->get_link_index_from_name("bline")));
+			Real radius = 0.0;
+			Real amount = synfig::find_closest_point((*bline)(get_time()), value, radius, bline->get_loop());
+			return canvas_interface()->change_value(synfigapp::ValueDesc(bline_vertex,bline_vertex->get_link_index_from_name("amount")), amount);
+		}
+	default:					// fall through
+
 		return canvas_interface()->change_value(value_desc,value);
 		break;
 	}