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

Close active cell editor when showing/hiding columns. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/17425

(cherry picked from commit f3ce3bc758)
This commit is contained in:
Jeff Young 2024-03-24 10:08:59 +00:00
parent 4bea619855
commit 1f461c7508
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/grid_tricks.cpp
View File

@ -444,7 +444,7 @@ void GRID_TRICKS::doPopupSelection( wxCommandEvent& event )
break; break;
default: default:
if( menu_id >= GRIDTRICKS_FIRST_SHOWHIDE ) if( menu_id >= GRIDTRICKS_FIRST_SHOWHIDE && m_grid->CommitPendingChanges( false ) )
{ {
int col = menu_id - GRIDTRICKS_FIRST_SHOWHIDE; int col = menu_id - GRIDTRICKS_FIRST_SHOWHIDE;

4
eeschema/dialogs/dialog_symbol_fields_table.cpp
View File

@ -146,15 +146,19 @@ protected:
{ {
if( m_fieldsCtrl->GetTextValue( row, FIELD_NAME_COLUMN ) == fieldName ) if( m_fieldsCtrl->GetTextValue( row, FIELD_NAME_COLUMN ) == fieldName )
{ {
if( m_grid->CommitPendingChanges( false ) )
m_fieldsCtrl->SetToggleValue( show, row, SHOW_FIELD_COLUMN ); m_fieldsCtrl->SetToggleValue( show, row, SHOW_FIELD_COLUMN );
break; break;
} }
} }
} }
else else
{
GRID_TRICKS::doPopupSelection( event ); GRID_TRICKS::doPopupSelection( event );
} }
} }
}
DIALOG_SHIM* m_dlg; DIALOG_SHIM* m_dlg;
wxDataViewListCtrl* m_fieldsCtrl; wxDataViewListCtrl* m_fieldsCtrl;