X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=56ee2dc61b373fcaeb30aa8cad1c2f5fcc4d13dd;hb=9cf07d9e2e127980c2edbfea4f92d0fa02f13310;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..56ee2dc 100644
--- a/synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp
@@ -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