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

Fix intial drag point for paste in LibEdit.

This commit is contained in:
Jeff Young 2019-05-27 10:07:13 +01:00
parent e9e28b9aac
commit 800cc1a11c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eeschema/tools/lib_edit_tool.cpp
View File

@ -628,10 +628,10 @@ int LIB_EDIT_TOOL::Paste( const TOOL_EVENT& aEvent )
if( !part ) if( !part )
return 0; return 0;
SELECTION& selection = m_selectionTool->GetSelection();
std::string text = m_toolMgr->GetClipboard(); std::string text = m_toolMgr->GetClipboard();
STRING_LINE_READER reader( text, "Clipboard" ); STRING_LINE_READER reader( text, "Clipboard" );
LIB_PART* newPart; LIB_PART* newPart;
EDA_ITEMS newItems;
try try
{ {
@ -645,6 +645,7 @@ int LIB_EDIT_TOOL::Paste( const TOOL_EVENT& aEvent )
} }
m_frame->SaveCopyInUndoList( part ); m_frame->SaveCopyInUndoList( part );
m_selectionTool->ClearSelection();
for( LIB_ITEM& item : newPart->GetDrawItems() ) for( LIB_ITEM& item : newPart->GetDrawItems() )
{ {
@ -652,8 +653,7 @@ int LIB_EDIT_TOOL::Paste( const TOOL_EVENT& aEvent )
continue; continue;
LIB_ITEM* newItem = (LIB_ITEM*) item.Clone(); LIB_ITEM* newItem = (LIB_ITEM*) item.Clone();
newItem->SetFlags( IS_NEW | IS_PASTED ); newItem->SetFlags( IS_NEW | IS_PASTED | SELECTED );
newItems.push_back( newItem );
part->GetDrawItems().push_back( newItem ); part->GetDrawItems().push_back( newItem );
getView()->Add( newItem ); getView()->Add( newItem );
@ -661,9 +661,15 @@ int LIB_EDIT_TOOL::Paste( const TOOL_EVENT& aEvent )
delete newPart; delete newPart;
m_toolMgr->RunAction( EE_ACTIONS::clearSelection, true ); m_selectionTool->RebuildSelection();
m_toolMgr->RunAction( EE_ACTIONS::addItemsToSel, true, &newItems );
m_toolMgr->RunAction( EE_ACTIONS::move, false ); if( !selection.Empty() )
{
LIB_ITEM* item = (LIB_ITEM*) selection.GetTopLeftItem();
selection.SetReferencePoint( item->GetPosition() );
m_toolMgr->RunAction( EE_ACTIONS::move, false );
}
return 0; return 0;
} }