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

Move layout updating out of OnUpdateUI to prevent endless looping. 

Fixes https://gitlab.com/kicad/code/kicad/issues/4623
This commit is contained in:
Jeff Young 2020-06-05 17:42:20 +01:00
parent 4d6abfdf05
commit 80c0e0080f
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pcbnew/dialogs/dialog_pad_properties.cpp
View File

@ -663,6 +663,7 @@ void DIALOG_PAD_PROPERTIES::initValues()
wxCommandEvent cmd_event; wxCommandEvent cmd_event;
setPadLayersList( m_dummyPad->GetLayerSet() ); setPadLayersList( m_dummyPad->GetLayerSet() );
OnPadShapeSelection( cmd_event ); OnPadShapeSelection( cmd_event );
OnOffsetCheckbox( cmd_event );
// Update basic shapes list // Update basic shapes list
displayPrimitivesList(); displayPrimitivesList();
@ -838,6 +839,14 @@ void DIALOG_PAD_PROPERTIES::OnPadShapeSelection( wxCommandEvent& event )
break; break;
} }
// Readjust props book size
wxSize size = m_shapePropsBook->GetSize();
size.y = m_shapePropsBook->GetPage( m_shapePropsBook->GetSelection() )->GetBestSize().y;
m_shapePropsBook->SetMaxSize( size );
for( size_t i = 0; i < m_notebook->GetPageCount(); ++i )
m_notebook->GetPage( i )->Layout();
m_sizeY.Enable( m_PadShape->GetSelection() != CHOICE_SHAPE_CIRCLE m_sizeY.Enable( m_PadShape->GetSelection() != CHOICE_SHAPE_CIRCLE
&& m_PadShape->GetSelection() != CHOICE_SHAPE_CUSTOM_CIRC_ANCHOR ); && m_PadShape->GetSelection() != CHOICE_SHAPE_CUSTOM_CIRC_ANCHOR );
@ -966,22 +975,13 @@ void DIALOG_PAD_PROPERTIES::OnUpdateUI( wxUpdateUIEvent& event )
if( !m_padToDieOpt->IsEnabled() ) if( !m_padToDieOpt->IsEnabled() )
m_padToDieOpt->SetValue( false ); m_padToDieOpt->SetValue( false );
// Show/hide extra properties // We can show/hide this here because it doesn't require the layout to be refreshed.
wxSize size = m_shapePropsBook->GetSize(); // All the others have to be done in their event handlers because doing a layout here
size.y = m_shapePropsBook->GetPage( m_shapePropsBook->GetSelection() )->GetBestSize().y; // causes infinite looping on MSW.
m_shapePropsBook->SetMaxSize( size );
// Show/hide offset controls
m_offsetCtrls->Show( m_offsetShapeOpt->GetValue() );
m_offsetShapeOptLabel->Show( m_offsetShapeOpt->GetValue() );
m_padToDie.Show( m_padToDieOpt->GetValue() ); m_padToDie.Show( m_padToDieOpt->GetValue() );
// Enable/disable Copper Layers control // Enable/disable Copper Layers control
m_rbCopperLayersSel->Enable( ii != 4 ); m_rbCopperLayersSel->Enable( ii != 4 );
// Adjust for any shown/hidden elements
for( size_t i = 0; i < m_notebook->GetPageCount(); ++i )
m_notebook->GetPage( i )->Layout();
} }
@ -1758,6 +1758,13 @@ void DIALOG_PAD_PROPERTIES::OnOffsetCheckbox( wxCommandEvent& event )
m_offsetY.SetValue( m_currentPad->GetOffset().y ); m_offsetY.SetValue( m_currentPad->GetOffset().y );
} }
// Show/hide controls
m_offsetCtrls->Show( m_offsetShapeOpt->GetValue() );
m_offsetShapeOptLabel->Show( m_offsetShapeOpt->GetValue() );
for( size_t i = 0; i < m_notebook->GetPageCount(); ++i )
m_notebook->GetPage( i )->Layout();
OnValuesChanged( event ); OnValuesChanged( event );
} }