X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=8c0f3b72f085ce9902efbeb43682bdea93ae2f5f;hb=f444974043946c071373c9caf7e7c85f9e1f9354;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..8c0f3b7 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -53,6 +53,8 @@
 #include <synfig/valuenode_dynamiclist.h>
 #include <synfig/valuenode_twotone.h>
 #include <synfig/valuenode_stripes.h>
+#include <synfig/valuenode_blinecalcvertex.h>
+#include <synfig/valuenode_bline.h>
 #include <synfig/layer.h>
 
 #include <synfigapp/uimanager.h>
@@ -2004,6 +2006,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 +2017,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 +2161,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 +2422,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 +2437,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();
@@ -2579,6 +2585,20 @@ CanvasView::duck_change_param(const synfig::Point &value,synfig::Layer::Handle l
 bool
 CanvasView::on_duck_changed(const synfig::Point &value,const synfigapp::ValueDesc& value_desc)
 {
+	if( ValueNode_BLineCalcVertex::Handle bline_vertex =
+		ValueNode_BLineCalcVertex::Handle::cast_dynamic(value_desc.get_value_node())
+	)
+	{
+		Real radius = 0.0;
+		Real amount = synfig::find_closest_point( 
+			( *bline_vertex->get_link(bline_vertex->get_link_index_from_name("bline")) )( get_time() ),
+			value,
+			radius,
+			( *bline_vertex->get_link(bline_vertex->get_link_index_from_name("loop")) )( get_time() ).get(bool())
+		);
+		return canvas_interface()->change_value(synfigapp::ValueDesc(bline_vertex,bline_vertex->get_link_index_from_name("amount")), amount);
+	}
+
 	switch(value_desc.get_value_type())
 	{
 	case ValueBase::TYPE_REAL: