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

PCB: fix net inspector assert on column show/hide menu 

Also handle 0-width columns coming in from settings. GTK seems to have
an issue where these columns are impossible to resize even if they are
made visible.
This commit is contained in:
Mike Williams 2024-04-03 12:38:31 -04:00
parent bab6913e14
commit 2acf928723
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pcbnew/widgets/pcb_net_inspector_panel.cpp
View File

@ -343,7 +343,8 @@ void PCB_NET_INSPECTOR_PANEL::adjustListColumnSizes( PANEL_NET_INSPECTOR_SETTING
for( size_t ii = 0; ii < m_columns.size(); ++ii )
{
const int newWidth = cfg->col_widths[ii];
m_netsList->GetColumn( ii )->SetWidth( newWidth );
// Make sure we end up with something non-zero so we can resize it
m_netsList->GetColumn( ii )->SetWidth( std::max( newWidth, 10 ) );
m_netsList->GetColumn( ii )->SetHidden( cfg->col_hidden[ii] );
}
}
@ -1394,8 +1395,8 @@ void PCB_NET_INSPECTOR_PANEL::generateShowHideColumnMenu( wxMenu* target )
wxMenuItem* opt = new wxMenuItem( target, ID_HIDE_COLUMN + i, m_columns[i].display_name,
wxEmptyString, wxITEM_CHECK );
wxDataViewColumn* col = getDisplayedColumnForModelField( i );
opt->Check( !col->IsHidden() );
target->Append( opt );
opt->Check( !col->IsHidden() );
}
target->AppendSeparator();
@ -1405,8 +1406,8 @@ void PCB_NET_INSPECTOR_PANEL::generateShowHideColumnMenu( wxMenu* target )
wxMenuItem* opt = new wxMenuItem( target, ID_HIDE_COLUMN + i, m_columns[i].display_name,
wxEmptyString, wxITEM_CHECK );
wxDataViewColumn* col = getDisplayedColumnForModelField( i );
opt->Check( !col->IsHidden() );
target->Append( opt );
opt->Check( !col->IsHidden() );
}
}
@ -1501,6 +1502,8 @@ void PCB_NET_INSPECTOR_PANEL::onSettingsMenu( wxCommandEvent& event )
{
const int columnId = event.GetId() - ID_HIDE_COLUMN;
wxDataViewColumn* col = getDisplayedColumnForModelField( columnId );
// Make sure we end up with something non-zero so we can resize it
col->SetWidth( std::max( col->GetWidth(), 10 ) );
col->SetHidden( !col->IsHidden() );
}
break;