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

Fix a couple of undo bugs. 

The first caused items coming back from undo to be hidden.

The second caused them to be ungrouped from the parent meander.
This commit is contained in:
Jeff Young 2023-10-12 17:09:34 +01:00
parent cdc9c2e409
commit 78ee6f2e42
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pcbnew/generators/pcb_generator_meanders.cpp
View File

@ -539,6 +539,7 @@ public:
PNS::ROUTER* router = aTool->Router(); PNS::ROUTER* router = aTool->Router();
int layer = GetLayer(); int layer = GetLayer();
int undoFlags = 0;
// Ungroup first so that undo works // Ungroup first so that undo works
if( !GetItems().empty() ) if( !GetItems().empty() )
@ -552,10 +553,7 @@ public:
group->RemoveAll(); group->RemoveAll();
aFrame->SaveCopyInUndoList( undoList, UNDO_REDO::UNGROUP ); aFrame->SaveCopyInUndoList( undoList, UNDO_REDO::UNGROUP );
} undoFlags |= APPEND_UNDO;
else
{
aCommit->Push( "" );
} }
aCommit->Remove( this ); aCommit->Remove( this );
@ -582,7 +580,7 @@ public:
aCommit->Add( item ); aCommit->Add( item );
} }
aCommit->Push( "Remove Meander", APPEND_UNDO ); aCommit->Push( "Remove Meander", undoFlags );
} }
std::optional<PNS::LINE> getLine( const VECTOR2I& aStart, const VECTOR2I& aEnd, std::optional<PNS::LINE> getLine( const VECTOR2I& aStart, const VECTOR2I& aEnd,
@ -834,10 +832,23 @@ public:
} }
} }
// Store isNew as BOARD_COMMIT::Push() is going to clear it.
bool isNew = IsNew();
if( aCommitMsg.IsEmpty() ) if( aCommitMsg.IsEmpty() )
aCommit->Push( _( "Edit Meander" ), aCommitFlags ); aCommit->Push( _( "Edit Meander" ), aCommitFlags );
else else
aCommit->Push( aCommitMsg, aCommitFlags ); aCommit->Push( aCommitMsg, aCommitFlags );
if( isNew && !GetItems().empty() )
{
PICKED_ITEMS_LIST undoList;
for( BOARD_ITEM* member : GetItems() )
undoList.PushItem( ITEM_PICKER( nullptr, member, UNDO_REDO::REGROUP ) );
aFrame->AppendCopyToUndoList( undoList, UNDO_REDO::REGROUP );
}
} }
void EditRevert( GENERATOR_TOOL* aTool, BOARD* aBoard, PCB_BASE_EDIT_FRAME* aFrame, void EditRevert( GENERATOR_TOOL* aTool, BOARD* aBoard, PCB_BASE_EDIT_FRAME* aFrame,

2
pcbnew/undo_redo.cpp
View File

@ -295,6 +295,8 @@ void PCB_BASE_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList )
UNDO_REDO status = aList->GetPickedItemStatus( ii ); UNDO_REDO status = aList->GetPickedItemStatus( ii );
if( status != UNDO_REDO::DELETED if( status != UNDO_REDO::DELETED
&& status != UNDO_REDO::UNGROUP
&& status != UNDO_REDO::REGROUP
&& status != UNDO_REDO::DRILLORIGIN // origin markers never on board && status != UNDO_REDO::DRILLORIGIN // origin markers never on board
&& status != UNDO_REDO::GRIDORIGIN // origin markers never on board && status != UNDO_REDO::GRIDORIGIN // origin markers never on board
&& status != UNDO_REDO::PAGESETTINGS ) // nor are page settings proxy items && status != UNDO_REDO::PAGESETTINGS ) // nor are page settings proxy items