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

Don't save sheet multiple times on undo stack. 

Fixes https://gitlab.com/kicad/code/kicad/issues/7063
This commit is contained in:
Jeff Young 2021-01-12 23:55:46 +00:00
parent f30cea8034
commit d23b5f89b3
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
eeschema/tools/sch_edit_tool.cpp
View File

@ -64,6 +64,7 @@
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
#include <symbol_editor_settings.h> #include <symbol_editor_settings.h>
#include <dialogs/dialog_edit_label.h> #include <dialogs/dialog_edit_label.h>
#include <core/kicad_algo.h>
class SYMBOL_UNIT_MENU : public ACTION_MENU class SYMBOL_UNIT_MENU : public ACTION_MENU
{ {
@ -1021,6 +1022,22 @@ int SCH_EDIT_TOOL::DoDelete( const TOOL_EVENT& aEvent )
sch_item->SetFlags( STRUCT_DELETED ); sch_item->SetFlags( STRUCT_DELETED );
// clean up junctions at the end // clean up junctions at the end
} }
else if( sch_item->Type() == SCH_SHEET_PIN_T )
{
SCH_SHEET_PIN* pin = (SCH_SHEET_PIN*) sch_item;
SCH_SHEET* sheet = pin->GetParent();
if( !alg::contains( items, sheet ) )
{
pin->SetFlags( STRUCT_DELETED );
saveCopyInUndoList( item, UNDO_REDO::DELETED, appendToUndo );
appendToUndo = true;
updateItem( pin, false );
sheet->RemovePin( pin );
}
}
else else
{ {
sch_item->SetFlags( STRUCT_DELETED ); sch_item->SetFlags( STRUCT_DELETED );
@ -1029,17 +1046,7 @@ int SCH_EDIT_TOOL::DoDelete( const TOOL_EVENT& aEvent )
updateItem( sch_item, false ); updateItem( sch_item, false );
if( sch_item->Type() == SCH_SHEET_PIN_T ) m_frame->RemoveFromScreen( sch_item, m_frame->GetScreen() );
{
SCH_SHEET_PIN* pin = (SCH_SHEET_PIN*) sch_item;
SCH_SHEET* sheet = pin->GetParent();
sheet->RemovePin( pin );
}
else
{
m_frame->RemoveFromScreen( sch_item, m_frame->GetScreen() );
}
if( sch_item->Type() == SCH_SHEET_T ) if( sch_item->Type() == SCH_SHEET_T )
m_frame->UpdateHierarchyNavigator(); m_frame->UpdateHierarchyNavigator();