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

Don't select new items after cancelling move following item duplication 

Fixes https://gitlab.com/kicad/code/kicad/issues/7956
This commit is contained in:
Jonathan Haas 2021-03-22 18:49:39 +01:00
parent 9f8127afcf
commit a677998f47
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcbnew/tools/edit_tool.cpp
View File

@ -932,7 +932,8 @@ int EDIT_TOOL::doMoveSelection( TOOL_EVENT aEvent, bool aPickReference )
m_toolMgr->RunAction( PCB_ACTIONS::selectionClear, true ); m_toolMgr->RunAction( PCB_ACTIONS::selectionClear, true );
editFrame->PopTool( tool ); editFrame->PopTool( tool );
return 0;
return restore_state ? -1 : 0;
} }
@ -2086,14 +2087,17 @@ int EDIT_TOOL::Duplicate( const TOOL_EVENT& aEvent )
// If items were duplicated, pick them up // If items were duplicated, pick them up
// this works well for "dropping" copies around and pushes the commit // this works well for "dropping" copies around and pushes the commit
TOOL_EVENT evt = PCB_ACTIONS::move.MakeEvent(); TOOL_EVENT evt = PCB_ACTIONS::move.MakeEvent();
Move( evt ); bool move_cancelled = Move( evt ) == -1;
// After moving the new items, we need to refresh the group and view flags // After moving the new items, we need to refresh the group and view flags
m_toolMgr->RunAction( PCB_ACTIONS::selectionClear, true ); m_toolMgr->RunAction( PCB_ACTIONS::selectionClear, true );
if( !is_hover ) if( !is_hover && !move_cancelled )
{
// Do not select new items if they've been deleted again by cancelling Move()
m_toolMgr->RunAction( PCB_ACTIONS::selectItems, true, &new_items ); m_toolMgr->RunAction( PCB_ACTIONS::selectItems, true, &new_items );
} }
}
return 0; return 0;
} }