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

Don't allow really narrow widths for tree control. 

Fixes https://gitlab.com/kicad/code/kicad/issues/5479
This commit is contained in:
Jeff Young 2021-03-30 20:58:35 +01:00
parent 8cb6f15687
commit 676d862bee
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/lib_tree_model_adapter.cpp
View File

@ -62,7 +62,7 @@ unsigned int LIB_TREE_MODEL_ADAPTER::IntoArray( LIB_TREE_NODE const& aNode,
{ {
unsigned int n = 0; unsigned int n = 0;
for( auto const& child: aNode.m_Children ) for( std::unique_ptr<LIB_TREE_NODE> const& child: aNode.m_Children )
{ {
if( child->m_Score > 0 ) if( child->m_Score > 0 )
{ {
@ -91,7 +91,7 @@ LIB_TREE_MODEL_ADAPTER::LIB_TREE_MODEL_ADAPTER( EDA_BASE_FRAME* aParent, wxStrin
m_colWidths[PART_COL] = 360; m_colWidths[PART_COL] = 360;
m_colWidths[DESC_COL] = 2000; m_colWidths[DESC_COL] = 2000;
auto cfg = Kiface().KifaceSettings(); APP_SETTINGS_BASE* cfg = Kiface().KifaceSettings();
m_colWidths[PART_COL] = cfg->m_LibTree.column_width; m_colWidths[PART_COL] = cfg->m_LibTree.column_width;
// Read the pinned entries from the project config // Read the pinned entries from the project config
@ -114,7 +114,7 @@ void LIB_TREE_MODEL_ADAPTER::SaveColWidths()
{ {
if( m_widget ) if( m_widget )
{ {
auto cfg = Kiface().KifaceSettings(); APP_SETTINGS_BASE* cfg = Kiface().KifaceSettings();
cfg->m_LibTree.column_width = m_widget->GetColumn( PART_COL )->GetWidth(); cfg->m_LibTree.column_width = m_widget->GetColumn( PART_COL )->GetWidth();
} }
} }
@ -131,7 +131,7 @@ void LIB_TREE_MODEL_ADAPTER::SavePinnedItems()
entries.clear(); entries.clear();
m_pinnedLibs.clear(); m_pinnedLibs.clear();
for( auto& child: m_tree.m_Children ) for( std::unique_ptr<LIB_TREE_NODE>& child: m_tree.m_Children )
{ {
if( child->m_Pinned ) if( child->m_Pinned )
{ {
@ -252,7 +252,7 @@ void LIB_TREE_MODEL_ADAPTER::UpdateSearchString( wxString const& aSearch, bool a
if( bestMatch ) if( bestMatch )
{ {
auto item = wxDataViewItem( bestMatch ); wxDataViewItem item = wxDataViewItem( bestMatch );
m_widget->Select( item ); m_widget->Select( item );
// Make sure the *parent* item is visible. The selected item is the // Make sure the *parent* item is visible. The selected item is the
@ -366,7 +366,7 @@ int LIB_TREE_MODEL_ADAPTER::GetItemCount() const
wxDataViewItem LIB_TREE_MODEL_ADAPTER::FindItem( const LIB_ID& aLibId ) wxDataViewItem LIB_TREE_MODEL_ADAPTER::FindItem( const LIB_ID& aLibId )
{ {
for( auto& lib: m_tree.m_Children ) for( std::unique_ptr<LIB_TREE_NODE>& lib: m_tree.m_Children )
{ {
if( lib->m_Name != aLibId.GetLibNickname() ) if( lib->m_Name != aLibId.GetLibNickname() )
continue; continue;
@ -375,7 +375,7 @@ wxDataViewItem LIB_TREE_MODEL_ADAPTER::FindItem( const LIB_ID& aLibId )
if( aLibId.GetLibItemName() == "" ) if( aLibId.GetLibItemName() == "" )
return ToItem( lib.get() ); return ToItem( lib.get() );
for( auto& alias: lib->m_Children ) for( std::unique_ptr<LIB_TREE_NODE>& alias: lib->m_Children )
{ {
if( alias->m_Name == aLibId.GetLibItemName() ) if( alias->m_Name == aLibId.GetLibItemName() )
return ToItem( alias.get() ); return ToItem( alias.get() );
@ -517,11 +517,11 @@ void LIB_TREE_MODEL_ADAPTER::FindAndExpand( LIB_TREE_NODE& aNode,
std::function<bool( LIB_TREE_NODE const* )> aFunc, std::function<bool( LIB_TREE_NODE const* )> aFunc,
LIB_TREE_NODE** aHighScore ) LIB_TREE_NODE** aHighScore )
{ {
for( auto& node: aNode.m_Children ) for( std::unique_ptr<LIB_TREE_NODE>& node: aNode.m_Children )
{ {
if( aFunc( &*node ) ) if( aFunc( &*node ) )
{ {
auto item = wxDataViewItem( &*node ); wxDataViewItem item = wxDataViewItem( &*node );
m_widget->ExpandAncestors( item ); m_widget->ExpandAncestors( item );
if( !(*aHighScore) || node->m_Score > (*aHighScore)->m_Score ) if( !(*aHighScore) || node->m_Score > (*aHighScore)->m_Score )

6
common/settings/app_settings.cpp
View File

@ -80,6 +80,12 @@ APP_SETTINGS_BASE::APP_SETTINGS_BASE( const std::string& aFilename, int aSchemaV
m_params.emplace_back( new PARAM<int>( "lib_tree.column_width", m_params.emplace_back( new PARAM<int>( "lib_tree.column_width",
&m_LibTree.column_width, 360 ) ); &m_LibTree.column_width, 360 ) );
// Now that we allow hiding/showing of the tree control, it's never terribly useful to
// decrease the width to nothing, and wxWidgets appears to have some bugs where it sets it
// way too narrow.
if( m_LibTree.column_width < 360 )
m_LibTree.column_width = 360;
m_params.emplace_back( new PARAM<bool>( "printing.background", m_params.emplace_back( new PARAM<bool>( "printing.background",
&m_Printing.background, false ) ); &m_Printing.background, false ) );