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

Uniformly apply focus hack to auto-preview. 

Since the feature is controversial this also moves it into a single
function so that it's easy to disable.

Fixes https://gitlab.com/kicad/code/kicad/issues/5477
This commit is contained in:
Jeff Young 2020-09-08 22:15:14 +01:00
parent 37e268c162
commit 5d304cfa2a
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pcbnew/dialogs/dialog_pad_properties.cpp
View File

@ -240,6 +240,18 @@ void DIALOG_PAD_PROPERTIES::OnCancel( wxCommandEvent& event )
} }
void DIALOG_PAD_PROPERTIES::autoSelectPreview( int aPage )
{
// This is the place to turn auto-select off.
wxWindow* focus = FindFocus();
m_previewNotebook->ChangeSelection( aPage );
if( focus )
focus->SetFocus();
}
void DIALOG_PAD_PROPERTIES::enablePrimitivePage( bool aEnable ) void DIALOG_PAD_PROPERTIES::enablePrimitivePage( bool aEnable )
{ {
// Enable or disable the widgets in page managing custom shape primitives // Enable or disable the widgets in page managing custom shape primitives
@ -323,6 +335,7 @@ void DIALOG_PAD_PROPERTIES::updateRoundRectCornerValues()
m_tcChamferRatio1->ChangeValue( ratio ); m_tcChamferRatio1->ChangeValue( ratio );
} }
autoSelectPreview( 0 );
redraw(); redraw();
} }
@ -348,7 +361,7 @@ void DIALOG_PAD_PROPERTIES::onCornerRadiusChange( wxCommandEvent& event )
m_tcCornerSizeRatio->ChangeValue( ratio ); m_tcCornerSizeRatio->ChangeValue( ratio );
m_tcCornerSizeRatio1->ChangeValue( ratio ); m_tcCornerSizeRatio1->ChangeValue( ratio );
m_previewNotebook->ChangeSelection( 0 ); autoSelectPreview( 0 );
redraw(); redraw();
} }
@ -434,7 +447,7 @@ void DIALOG_PAD_PROPERTIES::onCornerSizePercentChange( wxCommandEvent& event )
m_cornerRadius.ChangeValue( m_dummyPad->GetRoundRectCornerRadius() ); m_cornerRadius.ChangeValue( m_dummyPad->GetRoundRectCornerRadius() );
} }
m_previewNotebook->ChangeSelection( 0 ); autoSelectPreview( 0 );
redraw(); redraw();
} }
@ -788,7 +801,7 @@ void DIALOG_PAD_PROPERTIES::onChangePadMode( wxCommandEvent& event )
settings->SetHighContrast( false ); settings->SetHighContrast( false );
settings->SetContrastModeDisplay( HIGH_CONTRAST_MODE::NORMAL ); settings->SetContrastModeDisplay( HIGH_CONTRAST_MODE::NORMAL );
m_previewNotebook->ChangeSelection( 0 ); autoSelectPreview( 0 );
redraw(); redraw();
} }
@ -888,7 +901,7 @@ void DIALOG_PAD_PROPERTIES::OnPadShapeSelection( wxCommandEvent& event )
if( m_MainSizer->GetSize().y < m_MainSizer->GetMinSize().y ) if( m_MainSizer->GetSize().y < m_MainSizer->GetMinSize().y )
m_MainSizer->SetSizeHints( this ); m_MainSizer->SetSizeHints( this );
m_previewNotebook->ChangeSelection( 0 ); autoSelectPreview( 0 );
redraw(); redraw();
} }
@ -896,7 +909,7 @@ void DIALOG_PAD_PROPERTIES::OnPadShapeSelection( wxCommandEvent& event )
void DIALOG_PAD_PROPERTIES::OnDrillShapeSelected( wxCommandEvent& event ) void DIALOG_PAD_PROPERTIES::OnDrillShapeSelected( wxCommandEvent& event )
{ {
transferDataToPad( m_dummyPad ); transferDataToPad( m_dummyPad );
m_previewNotebook->ChangeSelection( 0 ); autoSelectPreview( 0 );
redraw(); redraw();
} }
@ -904,7 +917,7 @@ void DIALOG_PAD_PROPERTIES::OnDrillShapeSelected( wxCommandEvent& event )
void DIALOG_PAD_PROPERTIES::PadOrientEvent( wxCommandEvent& event ) void DIALOG_PAD_PROPERTIES::PadOrientEvent( wxCommandEvent& event )
{ {
transferDataToPad( m_dummyPad ); transferDataToPad( m_dummyPad );
m_previewNotebook->ChangeSelection( 0 ); autoSelectPreview( 0 );
redraw(); redraw();
} }
@ -1137,7 +1150,7 @@ void DIALOG_PAD_PROPERTIES::OnSetCopperLayers( wxCommandEvent& event )
{ {
if( m_PadType->GetSelection() == 0 || m_PadType->GetSelection() == 3 ) if( m_PadType->GetSelection() == 0 || m_PadType->GetSelection() == 3 )
{ {
m_previewNotebook->ChangeSelection( 1 ); autoSelectPreview( 1 );
switch( event.GetSelection() ) switch( event.GetSelection() )
{ {
@ -1149,7 +1162,7 @@ void DIALOG_PAD_PROPERTIES::OnSetCopperLayers( wxCommandEvent& event )
} }
else else
{ {
m_previewNotebook->ChangeSelection( 0 ); autoSelectPreview( 0 );
m_stackupImage->SetBitmap( wxBitmap() ); m_stackupImage->SetBitmap( wxBitmap() );
} }

2
pcbnew/dialogs/dialog_pad_properties.h
View File

@ -96,6 +96,8 @@ private:
void updateRoundRectCornerValues(); void updateRoundRectCornerValues();
void enablePrimitivePage( bool aEnable ); ///< enable (or disable) the primitive page editor void enablePrimitivePage( bool aEnable ); ///< enable (or disable) the primitive page editor
void autoSelectPreview( int aPage );
/** /**
* Function setPadLayersList * Function setPadLayersList
* updates the CheckBox states in pad layers list, * updates the CheckBox states in pad layers list,