X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=97c0a6dbc13ea2c5b6221bc644ec876c4223bbaa;hb=1d7e7e5eb9e2198cd534eebf37cff625ba73c3da;hp=57d079ddbf68fe98d4c994fe324688933a639a5f;hpb=933698eb69791193b53ce0142909502de42a6124;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index 57d079d..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;
 }
 
@@ -2580,9 +2578,15 @@ void
 studio::WorkArea::zoom_fit()
 {
 	float new_zoom(min(drawing_area->get_width() * zoom / w, drawing_area->get_height() * zoom / h));
-	if (zoom == new_zoom) return set_zoom(prev_zoom);
+	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