X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=a9bda671951d58e14bc39cef81eefab89f76aa56;hb=f2d224b1f0a8841cc014bcbdee9ef2f3acea865f;hp=b2263f609f1441b27a317dd0f6198867e743284b;hpb=7f9abbbc61efb68086aec4e1d2297694856e55f5;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index b2263f6..a9bda67 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -1980,6 +1980,18 @@ CanvasView::refresh_rend_desc()
 	}
 
 	//clamp time to big bounds...
+	if(time_window_adjustment().get_value() < begin_time)
+	{
+		time_window_adjustment().set_value(begin_time);
+		time_window_adjustment().value_changed();
+	}
+
+	if(time_window_adjustment().get_value() + time_window_adjustment().get_page_size() > end_time)
+	{
+		time_window_adjustment().set_value(end_time - time_window_adjustment().get_page_size());
+		time_window_adjustment().value_changed();
+	}
+
 	if(time_adjustment().get_value() < begin_time)
 	{
 		time_adjustment().set_value(begin_time);
@@ -3449,7 +3461,7 @@ CanvasView::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& con
 				}
 				else
 				{
-					if(canvas_interface()->import(filename))
+					if(canvas_interface()->import(filename, App::resize_imported_images))
 						success=true;
 				}
 
@@ -3558,7 +3570,7 @@ CanvasView::image_import()
 	// String filename(dirname(get_canvas()->get_file_name()));
 	String filename("*.*");
 	if(App::dialog_open_file(_("Import Image"), filename, IMAGE_DIR_PREFERENCE))
-		canvas_interface()->import(filename);
+		canvas_interface()->import(filename, App::resize_imported_images);
 }
 
 Smach::event_result