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

Re-enable and fix Move+Autoplace Fields 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/9766
This commit is contained in:
dsa-t 2021-11-29 20:48:16 +00:00 committed by Seth Hillbrand
parent 84dd515b6a
commit 5750e38102
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
eeschema/tools/sch_edit_tool.cpp
View File

@ -1190,26 +1190,40 @@ int SCH_EDIT_TOOL::EditField( const TOOL_EVENT& aEvent )
int SCH_EDIT_TOOL::AutoplaceFields( const TOOL_EVENT& aEvent )
{
EE_SELECTION& selection = m_selectionTool->RequestSelection( EE_COLLECTOR::FieldOwners );
EE_SELECTION& selection = m_selectionTool->RequestSelection( rotatableItems );
if( selection.Empty() )
return 0;
for( EDA_ITEM* item : selection )
SCH_ITEM* head = static_cast<SCH_ITEM*>( selection.Front() );
bool moving = head && head->IsMoving();
for( unsigned ii = 0; ii < selection.GetSize(); ii++ )
{
SCH_ITEM* sch_item = static_cast<SCH_ITEM*>( item );
SCH_ITEM* sch_item = static_cast<SCH_ITEM*>( selection.GetItem( ii ) );
if( !sch_item->IsNew() )
saveCopyInUndoList( sch_item, UNDO_REDO::CHANGED );
if( !moving && !sch_item->IsNew() )
saveCopyInUndoList( sch_item, UNDO_REDO::CHANGED, ii > 0 );
if( sch_item->IsType( EE_COLLECTOR::FieldOwners ) )
sch_item->AutoplaceFields( m_frame->GetScreen(), /* aManual */ true );
sch_item->AutoplaceFields( m_frame->GetScreen(), /* aManual */ true );
updateItem( sch_item, true );
}
m_frame->OnModify();
m_toolMgr->PostEvent( EVENTS::SelectedItemsModified );
if( selection.IsHover() )
m_toolMgr->RunAction( EE_ACTIONS::clearSelection, true );
if( moving )
{
m_toolMgr->RunAction( ACTIONS::refreshPreview );
}
else
{
if( selection.IsHover() )
m_toolMgr->RunAction( EE_ACTIONS::clearSelection, true );
m_frame->OnModify();
}
return 0;
}

5
eeschema/tools/sch_move_tool.cpp
View File

@ -431,11 +431,6 @@ int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
chain_commands = true;
break;
}
else if( evt->IsAction( &EE_ACTIONS::autoplaceFields ) )
{
// Currently this makes a mess when done while moving/dragging, so disable it.
wxBell();
}
else if( evt->Action() == TA_CHOICE_MENU_CHOICE )
{
if( evt->GetCommandId().get() >= ID_POPUP_SCH_SELECT_UNIT_CMP