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

Exit pad edit mode before closing footprint editor. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16766
This commit is contained in:
Jeff Young 2024-01-26 13:48:41 +00:00
parent f4e123f57e
commit cc058a7927
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pcbnew/footprint_edit_frame.cpp
View File

@ -808,6 +808,11 @@ bool FOOTPRINT_EDIT_FRAME::canCloseWindow( wxCloseEvent& aEvent )
} }
} }
PAD_TOOL* padTool = m_toolManager->GetTool<PAD_TOOL>();
if( padTool->InPadEditMode() )
padTool->ExitPadEditMode();
// Save footprint tree column widths // Save footprint tree column widths
m_adapter->SaveSettings(); m_adapter->SaveSettings();

15
pcbnew/tools/pad_tool.cpp
View File

@ -690,10 +690,7 @@ int PAD_TOOL::EditPad( const TOOL_EVENT& aEvent )
} }
if( m_editPad == niluuid ) if( m_editPad == niluuid )
{ ExitPadEditMode();
settings->m_PadEditModePad = nullptr;
exitPadEditMode();
}
return 0; return 0;
} }
@ -728,7 +725,7 @@ int PAD_TOOL::OnUndoRedo( const TOOL_EVENT& aEvent )
if( flaggedPad ) if( flaggedPad )
enterPadEditMode(); enterPadEditMode();
else else
exitPadEditMode(); ExitPadEditMode();
} }
return 0; return 0;
@ -771,9 +768,13 @@ void PAD_TOOL::enterPadEditMode()
} }
void PAD_TOOL::exitPadEditMode() void PAD_TOOL::ExitPadEditMode()
{ {
PCB_DISPLAY_OPTIONS opts = frame()->GetDisplayOptions(); KIGFX::PCB_PAINTER* painter = static_cast<KIGFX::PCB_PAINTER*>( view()->GetPainter() );
PCB_RENDER_SETTINGS* settings = painter->GetSettings();
PCB_DISPLAY_OPTIONS opts = frame()->GetDisplayOptions();
settings->m_PadEditModePad = nullptr;
if( m_previousHighContrastMode != opts.m_ContrastModeDisplay ) if( m_previousHighContrastMode != opts.m_ContrastModeDisplay )
{ {

2
pcbnew/tools/pad_tool.h
View File

@ -63,6 +63,7 @@ public:
int OnUndoRedo( const TOOL_EVENT& aEvent ); int OnUndoRedo( const TOOL_EVENT& aEvent );
bool InPadEditMode() { return m_editPad != niluuid; } bool InPadEditMode() { return m_editPad != niluuid; }
void ExitPadEditMode();
wxString GetLastPadNumber() const { return m_lastPadNumber; } wxString GetLastPadNumber() const { return m_lastPadNumber; }
void SetLastPadNumber( const wxString& aPadNumber ) { m_lastPadNumber = aPadNumber; } void SetLastPadNumber( const wxString& aPadNumber ) { m_lastPadNumber = aPadNumber; }
@ -91,7 +92,6 @@ private:
void explodePad( PAD* aPad, PCB_LAYER_ID* aLayer ); void explodePad( PAD* aPad, PCB_LAYER_ID* aLayer );
void enterPadEditMode(); void enterPadEditMode();
void exitPadEditMode();
private: private:
wxString m_lastPadNumber; wxString m_lastPadNumber;