X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=56ee2dc61b373fcaeb30aa8cad1c2f5fcc4d13dd;hb=90eba740ba1b38dbc2edecd9b2acaf54cb54a916;hp=f638b017dbe62017262acd5a7cc5698980623463;hpb=98e42d53eff7c7130b90d657d4ef812a2ee6db79;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index f638b01..56ee2dc 100644
--- a/synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp
@@ -1288,26 +1288,16 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
 
 				if(duck)
 				{
-					clicked_duck=0;
+					// make a note of whether the duck we click on was selected or not
 					if(duck_is_selected(duck))
-					{
 						clicked_duck=duck;
-					}
 					else
 					{
-						if(modifier&GDK_SHIFT_MASK)
-						{
-							select_duck(duck);
-						}
-						else if(modifier&GDK_CONTROL_MASK)
-						{
-							select_duck(duck);
-						}
-						else
-						{
+						clicked_duck=0;
+						// if CTRL isn't pressed, clicking an unselected duck will unselect all other ducks
+						if(!(modifier&GDK_CONTROL_MASK))
 							clear_selected_ducks();
-							select_duck(duck);
-						}
+						select_duck(duck);
 					}
 				}
 			}
@@ -1597,37 +1587,20 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
 			get_canvas_view()->duck_refresh_flag=true;
 			if(!drag_did_anything)
 			{
-				//etl::handle<Duck> duck=find_duck(mouse_pos,radius);
-
-				if(modifier&GDK_SHIFT_MASK)
+				// if we originally clicked on a selected duck ...
+				if(clicked_duck)
 				{
-					//synfig::info("DUCK_DRAG_RELEASE: SHIFT-MASK ON!");
-					if(clicked_duck)
-					{
-						//synfig::info("DUCK_DRAG_RELEASE: CLICKED DUCK!");
+					// ... and CTRL is pressed, then just toggle the clicked duck
+					//     otherwise make the clicked duck the only selected duck
+					if(modifier&GDK_CONTROL_MASK)
 						unselect_duck(clicked_duck);
-					}
-				}
-				else if(modifier&GDK_CONTROL_MASK)
-				{
-					//synfig::info("DUCK_DRAG_RELEASE: CONTROL-MASK ON!");
-					if(clicked_duck)
-					{
-						//synfig::info("DUCK_DRAG_RELEASE: CLICKED DUCK!");
-						unselect_duck(clicked_duck);
-					}
-				}
-				else
-				{
-					//synfig::info("DUCK_DRAG_RELEASE: NO MASK!");
-					if(clicked_duck)
+					else
 					{
-						//synfig::info("DUCK_DRAG_RELEASE: CLICKED DUCK!");
 						clear_selected_ducks();
 						select_duck(clicked_duck);
 					}
+					clicked_duck->signal_user_click(0)();
 				}
-				if(clicked_duck)clicked_duck->signal_user_click(0)();
 			}
 			else
 			{
@@ -1655,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