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

Cancel preceeding command if Move was called to place it. 

Fixes https://gitlab.com/kicad/code/kicad/issues/5252
This commit is contained in:
Jeff Young 2020-08-19 13:13:12 +01:00
parent d3d90ddb67
commit 2bf4fcae2a
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pcbnew/tools/edit_tool.cpp
View File

@ -328,12 +328,12 @@ int EDIT_TOOL::doMoveSelection( const TOOL_EVENT& aEvent, bool aPickReference )
{ {
PCB_BASE_EDIT_FRAME* editFrame = getEditFrame<PCB_BASE_EDIT_FRAME>(); PCB_BASE_EDIT_FRAME* editFrame = getEditFrame<PCB_BASE_EDIT_FRAME>();
KIGFX::VIEW_CONTROLS* controls = getViewControls(); KIGFX::VIEW_CONTROLS* controls = getViewControls();
VECTOR2I originalCursorPos = controls->GetCursorPosition(); VECTOR2I originalCursorPos = controls->GetCursorPosition();
// Be sure that there is at least one item that we can modify. If nothing was selected before, // Be sure that there is at least one item that we can modify. If nothing was selected before,
// try looking for the stuff under mouse cursor (i.e. Kicad old-style hover selection) // try looking for the stuff under mouse cursor (i.e. Kicad old-style hover selection)
PCBNEW_SELECTION& selection = m_selectionTool->RequestSelection( PCBNEW_SELECTION& selection = m_selectionTool->RequestSelection(
[]( const VECTOR2I& aPt, GENERAL_COLLECTOR& aCollector, SELECTION_TOOL* sTool ) []( const VECTOR2I& aPt, GENERAL_COLLECTOR& aCollector, SELECTION_TOOL* sTool )
{ {
EditToolSelectionFilter( aCollector, EXCLUDE_TRANSIENTS, sTool ); EditToolSelectionFilter( aCollector, EXCLUDE_TRANSIENTS, sTool );
} ); } );
@ -379,6 +379,7 @@ int EDIT_TOOL::doMoveSelection( const TOOL_EVENT& aEvent, bool aPickReference )
} }
bool restore_state = false; bool restore_state = false;
bool fromOtherCommand = false;
VECTOR2I totalMovement; VECTOR2I totalMovement;
GRID_HELPER grid( m_toolMgr, editFrame->GetMagneticItemsSettings() ); GRID_HELPER grid( m_toolMgr, editFrame->GetMagneticItemsSettings() );
TOOL_EVENT* evt = const_cast<TOOL_EVENT*>( &aEvent ); TOOL_EVENT* evt = const_cast<TOOL_EVENT*>( &aEvent );
@ -483,6 +484,9 @@ int EDIT_TOOL::doMoveSelection( const TOOL_EVENT& aEvent, bool aPickReference )
m_commit->Modify( bItem ); m_commit->Modify( bItem );
}); });
} }
if( item->IsNew() )
fromOtherCommand = true;
} }
} }
@ -615,9 +619,25 @@ int EDIT_TOOL::doMoveSelection( const TOOL_EVENT& aEvent, bool aPickReference )
// If canceled, we need to remove the dynamic ratsnest from the screen // If canceled, we need to remove the dynamic ratsnest from the screen
if( restore_state ) if( restore_state )
{
m_commit->Revert(); m_commit->Revert();
if( fromOtherCommand )
{
PICKED_ITEMS_LIST* undo = editFrame->PopCommandFromUndoList();
if( undo )
{
editFrame->PutDataInPreviousState( undo, false );
undo->ClearListAndDeleteItems();
delete undo;
}
}
}
else else
{
m_commit->Push( _( "Drag" ) ); m_commit->Push( _( "Drag" ) );
}
m_toolMgr->RunAction( PCB_ACTIONS::hideDynamicRatsnest, true ); m_toolMgr->RunAction( PCB_ACTIONS::hideDynamicRatsnest, true );