X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=3af3417c4b045de2e01d820a38c65ee0dfd56460;hb=6058f1f8af684257c314a78cc0a24ced57bf3168;hp=d439d9e076670a7321bc7d7b9a60a812de917c7a;hpb=832c3b9bbd588cab26d2965d2e159128fc3d2431;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index d439d9e..3af3417 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
@@ -1057,6 +1057,13 @@ void
 CanvasView::on_current_time_widget_changed()
 {
 	set_time(current_time_widget->get_value());
+
+	// show the value being used - it will have been rounded to nearest frame
+	// this was already being done elsewhere, but only if the time was really changed;
+	// if the current time was 6f and the user edited it to 6.1f, then the 6.1f would
+	// be left in the display without the following line to fix it
+	current_time_widget->set_value(get_time());
+	current_time_widget->set_position(-1); // leave the cursor at the end
 }
 
 //	Gtk::Widget*
@@ -1196,7 +1203,7 @@ CanvasView::init_menus()
 		sigc::hide_return(sigc::ptr_fun(&studio::App::new_instance))
 	);
 	action_group->add( Gtk::Action::create("open", Gtk::Stock::OPEN),
-		sigc::hide_return(sigc::ptr_fun(&studio::App::dialog_open))
+		sigc::hide_return(sigc::mem_fun(*get_instance().get(), &studio::Instance::open))
 	);
 	action_group->add( Gtk::Action::create("save", Gtk::Stock::SAVE),
 		hide_return(sigc::mem_fun(*get_instance().get(), &studio::Instance::save))
@@ -2437,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();
@@ -2446,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();