X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=9038bb1e90d16c161547553c721123e6f0765a27;hb=4ba22fb51d97f1ecce04dcc5e40569a4354c1bae;hp=09c38f236403331e98755aa75498ae1751aa3477;hpb=41063fc828642a7ae12aeb50694f1cd4580eb467;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index 09c38f2..9038bb1 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());
@@ -1367,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
@@ -1620,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);
@@ -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;
 
@@ -2275,7 +2283,7 @@ studio::WorkArea::async_update_preview()
 	// if we have lots of pixels to render and the tile renderer isn't disabled, use it
 	int div;
 	div = low_resolution ? low_res_pixel_size : 1;
-	if (w*h > 240*div*135*div && !getenv("SYNFIG_DISABLE_TILE_RENDER"))
+	if ((w*h > 240*div*135*div && !getenv("SYNFIG_DISABLE_TILE_RENDER")) || getenv("SYNFIG_FORCE_TILE_RENDER"))
 	{
 		// do a tile render
 		handle<WorkAreaTarget> trgt(new class WorkAreaTarget(this,w,h));
@@ -2537,7 +2545,7 @@ WorkArea::queue_scroll()
 			drawing_area->queue_draw_area(      0, 0,       1, maxy);
 			drawing_area->queue_draw_area(maxx-dx, 0, maxx-dx, maxy);
 		}
-		else if (dx < 0) 
+		else if (dx < 0)
 		{
 			drawing_area->queue_draw_area(   maxx, 0,    maxx, maxy);
 			drawing_area->queue_draw_area(    -dx, 0,     -dx, maxy);
@@ -2547,7 +2555,7 @@ WorkArea::queue_scroll()
 			drawing_area->queue_draw_area(0,       0, maxx,       1);
 			drawing_area->queue_draw_area(0, maxy-dy, maxx, maxy-dy);
 		}
-		else if (dy < 0) 
+		else if (dy < 0)
 		{
 			drawing_area->queue_draw_area(0,    maxy, maxx,    maxy);
 			drawing_area->queue_draw_area(0,     -dy, maxx,     -dy);
@@ -2573,20 +2581,25 @@ 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) * 0.995);
+	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
@@ -2637,7 +2650,7 @@ studio::WorkArea::queue_render_preview()
 		//synfig::info("queue_render_preview(): (re)queuing...");
 		//render_idle_func_id=g_idle_add_full(G_PRIORITY_DEFAULT,__render_preview,this,NULL);
 		render_idle_func_id=g_timeout_add_full(
-			G_PRIORITY_DEFAULT,	// priority - 
+			G_PRIORITY_DEFAULT,	// priority -
 			queue_time,			// interval - the time between calls to the function, in milliseconds (1/1000ths of a second)
 			__render_preview,	// function - function to call
 			this,				// data     - data to pass to function