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

Proper commit handling for group children.

This commit is contained in:
Jeff Young 2020-10-31 17:25:22 +00:00
parent 6bf29deb7f
commit 33e54f136b
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pcbnew/tools/edit_tool.cpp
View File

@ -1357,29 +1357,26 @@ int EDIT_TOOL::Remove( const TOOL_EVENT& aEvent )
{ {
PCB_GROUP* group = static_cast<PCB_GROUP*>( item ); PCB_GROUP* group = static_cast<PCB_GROUP*>( item );
if( m_editModules ) auto removeItem = [&]( BOARD_ITEM* bItem )
{ {
MODULE* parent = static_cast<MODULE*>( item->GetParent() ); if( bItem->GetParent() && bItem->GetParent()->Type() == PCB_MODULE_T )
{
m_commit->Modify( parent ); m_commit->Modify( bItem->GetParent() );
getView()->Remove( group ); getView()->Remove( group );
parent->Remove( group ); bItem->GetParent()->Remove( group );
group->RunOnDescendants( [&]( BOARD_ITEM* bItem )
{
getView()->Remove( bItem );
parent->Remove( bItem );
});
} }
else else
{ {
m_commit->Remove( item ); m_commit->Remove( item );
group->RunOnDescendants( [&]( BOARD_ITEM* bItem )
{
m_commit->Remove( bItem );
});
} }
};
removeItem( group );
group->RunOnDescendants( [&]( BOARD_ITEM* aDescendant )
{
removeItem( aDescendant );
});
} }
break; break;