X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=a3764bb6fa39dc6e47559fed884b7bf157d8ec84;hb=f83c48489a30958935cdab2e9f5b7c34bd72b390;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..a3764bb 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);
@@ -2833,12 +2845,12 @@ CanvasView::rebuild_ducks_layer_(synfig::TransformStack& transform_stack, synfig
 
 			if(!scale.is_equal_to(Vector(1,1)))
 				transform_stack.push(new Transform_Scale(scale,origin));
-			if(!scale.is_equal_to(Vector(0,0)))
+			if(!origin.is_equal_to(Vector(0,0)))
 				transform_stack.push(new Transform_Translate(origin));
 
 			rebuild_ducks_layer_(transform_stack,child_canvas,selected_list);
 
-			if(!scale.is_equal_to(Vector(0,0)))
+			if(!origin.is_equal_to(Vector(0,0)))
 				transform_stack.pop();
 			if(!scale.is_equal_to(Vector(1,1)))
 				transform_stack.pop();
@@ -3307,6 +3319,16 @@ CanvasView::on_waypoint_clicked_canvasview(synfigapp::ValueDesc value_desc,
 		}
 
 		// ------------------------------------------------------------------------
+		if (size == 1)
+		{
+			const synfigapp::ValueDesc value_desc(synfig::ValueNode_Animated::Handle::cast_reinterpret(waypoint.get_parent_value_node()), time);
+			get_instance()->make_param_menu(waypoint_menu,canvas_interface()->get_canvas(),value_desc,0.5f);
+
+			// ------------------------------------------------------------------------
+			waypoint_menu->items().push_back(Gtk::Menu_Helpers::SeparatorElem());
+		}
+
+		// ------------------------------------------------------------------------
 		waypoint_menu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("_Jump To"),
 			sigc::bind(sigc::mem_fun(*canvas_interface(), &synfigapp::CanvasInterface::set_time), time)));
 
@@ -3449,8 +3471,11 @@ CanvasView::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& con
 				}
 				else
 				{
-					if(canvas_interface()->import(filename))
+					String errors, warnings;
+					if(canvas_interface()->import(filename, errors, warnings, App::resize_imported_images))
 						success=true;
+					if (warnings != "")
+						App::dialog_warning_blocking(_("Warnings"), strprintf("%s:\n\n%s", _("Warnings"), warnings.c_str()));
 				}
 
 				continue;
@@ -3557,8 +3582,13 @@ CanvasView::image_import()
 {
 	// String filename(dirname(get_canvas()->get_file_name()));
 	String filename("*.*");
+	String errors, warnings;
 	if(App::dialog_open_file(_("Import Image"), filename, IMAGE_DIR_PREFERENCE))
-		canvas_interface()->import(filename);
+	{
+		canvas_interface()->import(filename, errors, warnings, App::resize_imported_images);
+		if (warnings != "")
+			App::dialog_warning_blocking(_("Warnings"), strprintf("%s:\n\n%s", _("Warnings"), warnings.c_str()));
+	}
 }
 
 Smach::event_result