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

Delete shapes re-combined into a pad. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16193
This commit is contained in:
Jeff Young 2023-11-29 16:15:03 +00:00
parent f993e45325
commit 2545999b3d
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pcbnew/tools/pad_tool.cpp
View File

@ -361,18 +361,20 @@ int PAD_TOOL::EnumeratePads( const TOOL_EVENT& aEvent )
STATUS_TEXT_POPUP statusPopup( frame() ); STATUS_TEXT_POPUP statusPopup( frame() );
// Callable lambda to construct the pad number string for the given value // Callable lambda to construct the pad number string for the given value
const auto constructPadNumber = [&]( int aValue ) const auto constructPadNumber =
{ [&]( int aValue )
return wxString::Format( wxT( "%s%d" ), params->m_prefix.value_or( "" ), aValue ); {
}; return wxString::Format( wxT( "%s%d" ), params->m_prefix.value_or( "" ), aValue );
};
// Callable lambda to set the popup text for the given pad value // Callable lambda to set the popup text for the given pad value
const auto setPopupTextForValue = [&]( int aValue ) const auto setPopupTextForValue =
{ [&]( int aValue )
const wxString msg = {
_( "Click on pad %s\nPress <esc> to cancel all; double-click to finish" ); const wxString msg = _( "Click on pad %s\n"
statusPopup.SetText( wxString::Format( msg, constructPadNumber( aValue ) ) ); "Press <esc> to cancel all; double-click to finish" );
}; statusPopup.SetText( wxString::Format( msg, constructPadNumber( aValue ) ) );
};
setPopupTextForValue( seqPadNum ); setPopupTextForValue( seqPadNum );
statusPopup.Popup(); statusPopup.Popup();
@ -629,7 +631,12 @@ int PAD_TOOL::EditPad( const TOOL_EVENT& aEvent )
{ {
BOARD_COMMIT commit( frame() ); BOARD_COMMIT commit( frame() );
commit.Modify( pad->GetParentFootprint() ); commit.Modify( pad->GetParentFootprint() );
RecombinePad( pad, false );
std::vector<PCB_SHAPE*> shapes = RecombinePad( pad, false );
for( PCB_SHAPE* shape : shapes )
commit.Remove( shape );
commit.Push( _( "Edit Pad" ) ); commit.Push( _( "Edit Pad" ) );
} }