From b57331f450100ce29b98fba6f8111bde8641eadd Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Thu, 12 Sep 2013 10:24:23 +0200
Subject: [PATCH] Move tool is activated when drag event starts nearby selected
 items.

---
 pcbnew/tools/selection_tool.cpp | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/pcbnew/tools/selection_tool.cpp b/pcbnew/tools/selection_tool.cpp
index 63689482b5..ec4d661a24 100644
--- a/pcbnew/tools/selection_tool.cpp
+++ b/pcbnew/tools/selection_tool.cpp
@@ -111,8 +111,28 @@ int SELECTION_TOOL::Main( TOOL_EVENT& aEvent )
             }
             else
             {
-                // Now user wants to drag the selected items
-                m_toolMgr->InvokeTool( "pcbnew.InteractiveMove" );
+                bool runTool = false;
+
+                // Check if dragging event started within the currently selected items bounding box
+                std::set<BOARD_ITEM*>::iterator it, it_end;
+                for( it = m_selectedItems.begin(), it_end = m_selectedItems.end(); it != it_end; ++it )
+                {
+                    BOX2I itemBox = (*it)->ViewBBox();
+                    itemBox.Inflate( 500000 );    // Give some margin for gripping an item
+
+                    if( itemBox.Contains( evt->Position() ) )
+                    {
+                        // Click event occurred within a selected item bounding box
+                        // -> user wants to drag selected items
+                        runTool = true;
+                        break;
+                    }
+                }
+
+                if( runTool )
+                    m_toolMgr->InvokeTool( "pcbnew.InteractiveMove" );
+                else
+                    clearSelection();
             }
         }
         else if( dragging )
@@ -131,7 +151,7 @@ int SELECTION_TOOL::Main( TOOL_EVENT& aEvent )
 
 void SELECTION_TOOL::toggleSelection( BOARD_ITEM* aItem )
 {
-    if( m_selectedItems.find( aItem ) != m_selectedItems.end() )
+    if( aItem->IsSelected() )
     {
         aItem->ClearSelected();
         m_selectedItems.erase( aItem );