From 56fbfeeb4aef021410c25d6215ed27c92f9e7a3c Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Tue, 17 Jan 2017 09:05:17 -0500 Subject: [PATCH] Do not use default board solder mask clearance in footprint editor. The footprint editor was displaying the default solder mask clearance defined by the temporary BOARD object created a start up. Change the temporary BOARD default solder mask to 0 so the pad or footprint solder mask clearance setting is displayed when editing the footprint. fixes lp:1653980 https://bugs.launchpad.net/kicad/+bug/1653980 --- pcbnew/moduleframe.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pcbnew/moduleframe.cpp b/pcbnew/moduleframe.cpp index 381d38de30..3a283201f6 100644 --- a/pcbnew/moduleframe.cpp +++ b/pcbnew/moduleframe.cpp @@ -238,7 +238,11 @@ FOOTPRINT_EDIT_FRAME::FOOTPRINT_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) : // (it depends on the actual board) // So we do not show the default clearance, by setting it to 0 // The footprint or pad specific clearance will be shown - GetBoard()->GetDesignSettings().GetDefault()->SetClearance(0); + GetBoard()->GetDesignSettings().GetDefault()->SetClearance( 0 ); + + // Don't show the default board solder mask clearance in the footprint editor. Only the + // footprint or pad clearance setting should be shown if it is not 0. + GetBoard()->GetDesignSettings().m_SolderMaskMargin = 0; // restore the last footprint from the project, if any restoreLastFootprint(); @@ -562,6 +566,7 @@ void FOOTPRINT_EDIT_FRAME::OnUpdateVerticalToolbar( wxUpdateUIEvent& aEvent ) aEvent.Check( GetToolId() == aEvent.GetId() ); } + void FOOTPRINT_EDIT_FRAME::OnUpdateOptionsToolbar( wxUpdateUIEvent& aEvent ) { int id = aEvent.GetId();