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

Back out fromOtherCommand handling. 

It's only needed in PlaceModule() and creates problems here.  Also
adds a comment regarding the encapsulation leak that makes all this
hard to maintain.

Fixes https://gitlab.com/kicad/code/kicad/issues/5932
This commit is contained in:
Jeff Young 2020-10-09 23:40:12 +01:00
parent bb8ca2ba3a
commit 7f3ed1479e
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pcbnew/tools/edit_tool.cpp
View File

@ -395,7 +395,6 @@ int EDIT_TOOL::doMoveSelection( 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 );
@ -509,9 +508,6 @@ int EDIT_TOOL::doMoveSelection( TOOL_EVENT aEvent, bool aPickReference )
m_commit->Modify( bItem ); m_commit->Modify( bItem );
}); });
} }
if( item->IsNew() )
fromOtherCommand = true;
} }
} }
@ -631,31 +627,17 @@ int EDIT_TOOL::doMoveSelection( TOOL_EVENT aEvent, bool aPickReference )
m_dragging = false; m_dragging = false;
editFrame->UndoRedoBlock( false ); editFrame->UndoRedoBlock( false );
// Discard reference point when selection is "dropped" onto the board (ie: not dragging anymore) // Discard reference point when selection is "dropped" onto the board
selection.ClearReferencePoint(); selection.ClearReferencePoint();
// If canceled, we need to remove the dynamic ratsnest from the screen // TODO: there's an ecapsulation leak here: this commit often has more than just the move
// in it; for instance it might have a paste, append board, etc. as well.
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" ) );
}
// Remove the dynamic ratsnest from the screen
m_toolMgr->RunAction( PCB_ACTIONS::hideDynamicRatsnest, true ); m_toolMgr->RunAction( PCB_ACTIONS::hideDynamicRatsnest, true );
if( unselect ) if( unselect )