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

Grid dropdown doesn't always live in the same toolbar. 

Also fixes typo in grid properties dialog.

Fixes: lp:1839224
* https://bugs.launchpad.net/kicad/+bug/1839224
This commit is contained in:
Jeff Young 2019-08-08 11:23:13 +01:00
parent 9fe7bfb596
commit 4d53ff9811
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/eda_draw_frame.cpp
View File

@ -251,7 +251,7 @@ void EDA_DRAW_FRAME::OnUpdateSelectGrid( wxUpdateUIEvent& aEvent )
{ {
// No need to update the grid select box if it doesn't exist or the grid setting change // No need to update the grid select box if it doesn't exist or the grid setting change
// was made using the select box. // was made using the select box.
if( m_gridSelectBox == NULL || m_auxiliaryToolBar == NULL ) if( m_gridSelectBox == NULL )
return; return;
int select = wxNOT_FOUND; int select = wxNOT_FOUND;

2
pcbnew/dialogs/dialog_set_grid.cpp
View File

@ -132,7 +132,7 @@ bool DIALOG_SET_GRID::TransferDataToWindow()
m_comboBoxGrid2->SetSelection( m_parent->m_FastGrid2 ); m_comboBoxGrid2->SetSelection( m_parent->m_FastGrid2 );
int hk1 = ACTIONS::gridFast1.GetHotKey(); int hk1 = ACTIONS::gridFast1.GetHotKey();
int hk2 = ACTIONS::gridFast1.GetHotKey(); int hk2 = ACTIONS::gridFast2.GetHotKey();
m_grid1HotKey->SetLabel( wxString::Format( wxT( "(%s)" ), KeyNameFromKeyCode( hk1 ) ) ); m_grid1HotKey->SetLabel( wxString::Format( wxT( "(%s)" ), KeyNameFromKeyCode( hk1 ) ) );
m_grid2HotKey->SetLabel( wxString::Format( wxT( "(%s)" ), KeyNameFromKeyCode( hk2 ) ) ); m_grid2HotKey->SetLabel( wxString::Format( wxT( "(%s)" ), KeyNameFromKeyCode( hk2 ) ) );