haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix double disambiguation menu when dragging

This commit is contained in:
Maciej Suminski 2018-02-14 15:33:15 +01:00
parent 151021919e
commit 11d8b9ff55
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pcbnew/router/router_tool.cpp
View File

@ -1033,7 +1033,7 @@ void ROUTER_TOOL::NeighboringSegmentFilter( const VECTOR2I& aPt, GENERAL_COLLECT
} }
// Selection meets criteria; trim it to the reference item. // Selection meets criteria; trim it to the reference item.
for( int i = aCollector.GetCount()-1; i >= 0; i-- ) for( int i = aCollector.GetCount() - 1; i >= 0; i-- )
{ {
if( dynamic_cast<TRACK*>( aCollector[i] ) != reference ) if( dynamic_cast<TRACK*>( aCollector[i] ) != reference )
aCollector.Remove( i ); aCollector.Remove( i );
@ -1049,21 +1049,22 @@ bool ROUTER_TOOL::CanInlineDrag()
if( selection.Size() == 1 ) if( selection.Size() == 1 )
{ {
const BOARD_CONNECTED_ITEM* item = static_cast<const BOARD_CONNECTED_ITEM*>( selection.Front() ); const BOARD_CONNECTED_ITEM* item = static_cast<const BOARD_CONNECTED_ITEM*>( selection.Front() );
if( item->Type() == PCB_TRACE_T || item->Type() == PCB_VIA_T ) if( item->Type() == PCB_TRACE_T || item->Type() == PCB_VIA_T )
return true; return true;
} }
m_toolMgr->RunAction( PCB_ACTIONS::selectionCursor ); // restore selection to unfiltered state
return false; return false;
} }
int ROUTER_TOOL::InlineDrag( const TOOL_EVENT& aEvent ) int ROUTER_TOOL::InlineDrag( const TOOL_EVENT& aEvent )
{ {
// Get the item under the cursor
m_toolMgr->RunAction( PCB_ACTIONS::selectionCursor, true, NeighboringSegmentFilter );
const auto& selection = m_toolMgr->GetTool<SELECTION_TOOL>()->GetSelection(); const auto& selection = m_toolMgr->GetTool<SELECTION_TOOL>()->GetSelection();
if( selection.Empty() )
m_toolMgr->RunAction( PCB_ACTIONS::selectionCursor, true, NeighboringSegmentFilter );
if( selection.Size() != 1 ) if( selection.Size() != 1 )
return 0; return 0;