X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=ed139af87b207cce3f035664a491fa90828b1f5d;hb=eebbddf333289484acaf808394d33e4c823eba97;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..ed139af 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -2004,6 +2004,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 +2015,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 +2159,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 +2420,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 +2435,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();