X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=ad2ab6be9aa8d1ed479bb2e93408f1371d4b94f9;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=2f1a3728b2c2bd36b4a0ec02da7d346c3a70a8ec;hpb=ee7cac0ad3dd781264c014897a821890b7e335b6;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 2f1a372..ad2ab6b 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -6,7 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2007, 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -2444,7 +2444,12 @@ CanvasView::on_time_changed()
 void
 CanvasView::time_zoom_in()
 {
+	float frame_rate = get_canvas()->rend_desc().get_frame_rate();
+	Time min_page_size = 2/frame_rate;
+
 	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().changed();
 
 	refresh_time_window();
@@ -2453,7 +2458,12 @@ CanvasView::time_zoom_in()
 void
 CanvasView::time_zoom_out()
 {
+	Time length = (get_canvas()->rend_desc().get_time_end() -
+				   get_canvas()->rend_desc().get_time_start());
+
 	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().changed();
 
 	refresh_time_window();