X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=c4ab7d7a0b2dcff55fc71543b07c7cf7a86a0bd4;hb=1f453e8ab546a357781372fe98aa1d004387d4b1;hp=d7d61c00eb132c3f419ecbac18b6081ea85face3;hpb=756c0d29ac1742f231e6615f9a577e574e35a4af;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index d7d61c0..c4ab7d7 100644
--- a/synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp
@@ -828,18 +828,22 @@ WorkArea::~WorkArea()
 		render_idle_func_id=0;
 }
 
+#ifdef SINGLE_THREADED
 bool
 WorkArea::get_updating()const
 {
 	return App::single_threaded && async_renderer && async_renderer->updating;
 }
+#endif
 
+#ifdef SINGLE_THREADED
 void
 WorkArea::stop_updating(bool cancel)
 {
 	async_renderer->stop();
 	if (cancel) canceled_=true;
 }
+#endif
 
 void
 WorkArea::save_meta_data()
@@ -1164,7 +1168,7 @@ WorkArea::on_key_press_event(GdkEventKey* event)
 			break;
 	}
 
-	synfigapp::Action::PassiveGrouper grouper(instance.get(),"Nudge");
+	synfigapp::Action::PassiveGrouper grouper(instance.get(),_("Nudge"));
 
 	// Grid snap does not apply to nudging
 	bool grid_snap_holder(get_grid_snap());
@@ -1347,8 +1351,11 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
 
 
 			selected_bezier=find_bezier(mouse_pos,radius,&bezier_click_pos);
-			if(duck && duck->get_editable())
+			if(duck)
 			{
+				if (!duck->get_editable())
+					return true;
+
 				//get_selected_duck()->signal_user_click(0)();
 				//if(clicked_duck)clicked_duck->signal_user_click(0)();
 
@@ -1364,15 +1371,19 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
 						// if the tangent isn't split, then split it
 						if (!((*(parent_value_node->get_link("split")))(get_time()).get(bool())))
 						{
-							get_canvas_view()->canvas_interface()->
+							if (get_canvas_view()->canvas_interface()->
 								change_value(synfigapp::ValueDesc(parent_value_node,
 																  parent_value_node->get_link_index_from_name("split")),
-											 true);
-							// rebuild the ducks from scratch, so the tangents ducks aren't connected
-							get_canvas_view()->rebuild_ducks();
-
-							// reprocess the mouse click
-							return on_drawing_area_event(event);
+											 true))
+							{
+								// rebuild the ducks from scratch, so the tangents ducks aren't connected
+								get_canvas_view()->rebuild_ducks();
+
+								// reprocess the mouse click
+								return on_drawing_area_event(event);
+							}
+							else
+								return true;
 						}
 					} else {
 						// I don't know how to access the vertex from the tangent duck when originally drawing the bline in the bline tool
@@ -1617,7 +1628,7 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
 		else
 		if(dragging==DRAG_DUCK)
 		{
-			synfigapp::Action::PassiveGrouper grouper(instance.get(),"Move");
+			synfigapp::Action::PassiveGrouper grouper(instance.get(),_("Move"));
 			dragging=DRAG_NONE;
 			//translate_selected_ducks(mouse_pos);
 			set_axis_lock(false);
@@ -1921,9 +1932,6 @@ WorkArea::refresh_dimension_info()
 	pw=canvaswidth/w;
 	ph=canvasheight/h;
 
-	Duckmatic::set_flip_x(pw < 0);
-	Duckmatic::set_flip_y(ph > 0);
-
 	scrollx_adjustment.set_page_increment(abs(get_grid_size()[0]));
 	scrollx_adjustment.set_step_increment(abs(pw));
 	scrollx_adjustment.set_lower(-abs(canvaswidth));
@@ -2129,8 +2137,6 @@ WorkArea::refresh(GdkEventExpose*event)
 		drawing_frame->unset_bg(Gtk::STATE_NORMAL);
 #endif
 
-	previous_focus=get_focus_point();
-
 	return true;
 }
 
@@ -2216,12 +2222,14 @@ public:
 bool
 studio::WorkArea::async_update_preview()
 {
+#ifdef SINGLE_THREADED
 	if (get_updating())
 	{
 		stop_updating();
 		queue_render_preview();
 		return false;
 	}
+#endif
 
 	async_renderer=0;
 
@@ -2573,20 +2581,24 @@ studio::WorkArea::zoom_out()
 void
 studio::WorkArea::zoom_fit()
 {
-	// This really doesn't zoom to fit. Bug.
-	zoom_norm();
+	float new_zoom(min(drawing_area->get_width() * zoom / w, drawing_area->get_height() * zoom / h));
+	if (zoom / new_zoom > 0.995 && new_zoom / zoom > 0.995)
+	{
+		set_zoom(prev_zoom);
+		return set_focus_point(previous_focus);
+	}
+	previous_focus = get_focus_point();
+	prev_zoom = zoom;
+	set_zoom(new_zoom);
+	set_focus_point(Point(0,0));
 }
 
 void
 studio::WorkArea::zoom_norm()
 {
-	if(zoom==1.0)
-		set_zoom(prev_zoom);
-	else
-	{
-		prev_zoom=zoom;
-		set_zoom(1.0f);
-	}
+	if (zoom == 1.0) return set_zoom(prev_zoom);
+	prev_zoom = zoom;
+	set_zoom(1.0f);
 }
 
 gboolean