X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=d662c5508f1651119e0558e0666c0f4cc655780e;hb=2eaa4571bf99d6426b7a6f88add4119d0f8ce71b;hp=d3570032755913946cfdc6ef932516f84f91a4f2;hpb=44afd79d824b35f6ce29fbcaa2fabbf3f3b0a62d;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index d357003..d662c55 100644
--- a/synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp
@@ -262,7 +262,7 @@ public:
 	}
 
 
-	virtual bool start_frame(synfig::ProgressCallback *cb)
+	virtual bool start_frame(synfig::ProgressCallback */*cb*/)
 	{
 		synfig::Mutex::Lock lock(mutex);
 
@@ -506,7 +506,7 @@ public:
 	}
 
 
-	virtual bool start_frame(synfig::ProgressCallback *cb)
+	virtual bool start_frame(synfig::ProgressCallback */*cb*/)
 	{
 		return true;
 	}
@@ -1628,9 +1628,18 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
 				if(canvas_view->get_smach().process_event(EventBox(drag_point,mouse_pos,MouseButton(event->button.button),modifier))==Smach::RESULT_ACCEPT)
 					return true;
 
-				if(!(modifier&GDK_CONTROL_MASK) && !(modifier&GDK_SHIFT_MASK))
+				// when dragging a box around some ducks:
+				// SHIFT selects; CTRL toggles; SHIFT+CTRL unselects; <none> clears all then selects
+				if(modifier&GDK_SHIFT_MASK)
+					select_ducks_in_box(drag_point,mouse_pos);
+
+				if(modifier&GDK_CONTROL_MASK)
+					toggle_select_ducks_in_box(drag_point,mouse_pos);
+				else if(!(modifier&GDK_SHIFT_MASK))
+				{
 					clear_selected_ducks();
-				select_ducks_in_box(drag_point,mouse_pos);
+					select_ducks_in_box(drag_point,mouse_pos);
+				}
 				ret=true;
 			}
 			else
@@ -1772,7 +1781,7 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
 }
 
 bool
-WorkArea::on_hruler_event(GdkEvent *event)
+WorkArea::on_hruler_event(GdkEvent */*event*/)
 {
 /*
 	switch(event->type)
@@ -1829,7 +1838,7 @@ WorkArea::on_hruler_event(GdkEvent *event)
 }
 
 bool
-WorkArea::on_vruler_event(GdkEvent *event)
+WorkArea::on_vruler_event(GdkEvent */*event*/)
 {
 /*
 	switch(event->type)
@@ -1923,7 +1932,7 @@ WorkArea::screen_to_comp_coords(synfig::Point pos)const
 }
 
 synfig::Point
-WorkArea::comp_to_screen_coords(synfig::Point pos)const
+WorkArea::comp_to_screen_coords(synfig::Point /*pos*/)const
 {
 	synfig::warning("WorkArea::comp_to_screen_coords: Not yet implemented");
 	return synfig::Point();
@@ -2245,7 +2254,7 @@ studio::WorkArea::async_update_finished()
 	if(!async_renderer)
 		return;
 
-	// If we completed successfuly, then
+	// If we completed successfully, then
 	// we aren't dirty anymore
 	if(async_renderer->has_success())
 	{
@@ -2357,7 +2366,7 @@ again:
 	// it is being displayed correctly
 	drawing_area->queue_draw();
 
-	// If we completed successfuly, then
+	// If we completed successfully, then
 	// we aren't dirty anymore
 	if(ret)
 	{