X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=97c0a6dbc13ea2c5b6221bc644ec876c4223bbaa;hb=b342fcadc2077545469c2c967dde580231e6f77b;hp=c4f8be6eea49a76fd7fe4eede0e7a5ad4818b289;hpb=e2d2732c368b92259bba1bef890223831d997b5b;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index c4f8be6..97c0a6d 100644
--- a/synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp
@@ -2133,8 +2133,6 @@ WorkArea::refresh(GdkEventExpose*event)
 		drawing_frame->unset_bg(Gtk::STATE_NORMAL);
 #endif
 
-	previous_focus=get_focus_point();
-
 	return true;
 }
 
@@ -2579,20 +2577,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