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

Canceling Move cancels Pack too in Pack & Move footprints.

This commit is contained in:
Alex 2022-12-09 20:41:56 +03:00
parent 3d2b1aaf90
commit c1f82d0c80
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/tools/edit_tool.h
View File

@ -192,7 +192,7 @@ private:
bool invokeInlineRouter( int aDragMode );
bool isRouterActive() const;
int doMoveSelection( const TOOL_EVENT& aEvent );
int doMoveSelection( const TOOL_EVENT& aEvent, const wxString& aCommitMessage );
VECTOR2I getSafeMovement( const VECTOR2I& aMovement, const BOX2I& aSourceBBox,
const VECTOR2D& aBBoxOffset );

22
pcbnew/tools/edit_tool_move_fct.cpp
View File

@ -214,20 +214,17 @@ int EDIT_TOOL::PackAndMoveFootprints( const TOOL_EVENT& aEvent )
if( footprintsToPack.empty() )
return 0;
BOARD_COMMIT commit( editFrame );
BOX2I footprintsBbox;
BOX2I footprintsBbox;
for( FOOTPRINT* item : footprintsToPack )
{
commit.Modify( item );
m_commit->Modify( item );
footprintsBbox.Merge( item->GetBoundingBox( false, false ) );
}
SpreadFootprints( &footprintsToPack, footprintsBbox.Normalize().GetOrigin(), false );
commit.Push( _( "Pack footprints" ) );
return doMoveSelection( aEvent );
return doMoveSelection( aEvent, _( "Pack footprints" ) );
}
@ -239,7 +236,7 @@ int EDIT_TOOL::Move( const TOOL_EVENT& aEvent )
return 0;
}
return doMoveSelection( aEvent );
return doMoveSelection( aEvent, _( "Move" ) );
}
@ -277,7 +274,7 @@ VECTOR2I EDIT_TOOL::getSafeMovement( const VECTOR2I& aMovement, const BOX2I& aSo
}
int EDIT_TOOL::doMoveSelection( const TOOL_EVENT& aEvent )
int EDIT_TOOL::doMoveSelection( const TOOL_EVENT& aEvent, const wxString& aCommitMessage )
{
bool moveWithReference = aEvent.IsAction( &PCB_ACTIONS::moveWithReference );
bool moveIndividually = aEvent.IsAction( &PCB_ACTIONS::moveIndividually );
@ -567,9 +564,10 @@ int EDIT_TOOL::doMoveSelection( const TOOL_EVENT& aEvent )
{
// Prepare to start dragging
if( !evt->IsAction( &PCB_ACTIONS::move )
&& !evt->IsAction( &PCB_ACTIONS::moveWithReference )
&& !evt->IsAction( &PCB_ACTIONS::moveIndividually )
&& cfg->m_TrackDragAction != TRACK_DRAG_ACTION::MOVE )
&& !evt->IsAction( &PCB_ACTIONS::moveWithReference )
&& !evt->IsAction( &PCB_ACTIONS::moveIndividually )
&& !evt->IsAction( &PCB_ACTIONS::packAndMoveFootprints )
&& cfg->m_TrackDragAction != TRACK_DRAG_ACTION::MOVE )
{
if( invokeInlineRouter( PNS::DM_ANY ) )
break;
@ -823,7 +821,7 @@ int EDIT_TOOL::doMoveSelection( const TOOL_EVENT& aEvent )
}
else
{
m_commit->Push( _( "Drag" ) );
m_commit->Push( aCommitMessage );
m_toolMgr->RunAction( PCB_ACTIONS::selectItems, true, &orig_items );
}