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

Optimize TWO_COLUMN_TREE_LIST column sizing 

This was particularly slow for very long lists on macOS.
This commit is contained in:
Chris Pavlina 2017-02-24 12:51:53 -05:00
parent 9effcb80e7
commit 23d4da9e49
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/widgets/two_column_tree_list.cpp
View File

@ -89,7 +89,7 @@ void TWO_COLUMN_TREE_LIST::OnSize( wxSizeEvent& aEvent )
if( width > clamped_column_width ) if( width > clamped_column_width )
clamped_column_width = width; clamped_column_width = width;
width = WidthFor( GetItemText( item, m_rubber_band_column ) ); width = MemoWidthFor( GetItemText( item, m_rubber_band_column ) );
if( width > rubber_max_width ) if( width > rubber_max_width )
rubber_max_width = width; rubber_max_width = width;
} }
@ -119,3 +119,24 @@ void TWO_COLUMN_TREE_LIST::OnSize( wxSizeEvent& aEvent )
} }
} }
int TWO_COLUMN_TREE_LIST::MemoWidthFor( const wxString& aStr )
{
int width;
auto found = m_width_cache.find( aStr );
if( found == m_width_cache.end() )
{
width = WidthFor( aStr );
m_width_cache[aStr] = width;
}
else
{
width = found->second;
}
return width;
}
std::map<wxString, int> TWO_COLUMN_TREE_LIST::m_width_cache;

2
eeschema/component_tree_search_container.cpp
View File

@ -142,7 +142,7 @@ void COMPONENT_TREE_SEARCH_CONTAINER::SetTree( TWO_COLUMN_TREE_LIST* aTree )
if( m_tree ) if( m_tree )
{ {
m_tree->AppendColumn( _( "Part" ), wxCOL_WIDTH_AUTOSIZE, wxALIGN_LEFT, wxCOL_RESIZABLE ); m_tree->AppendColumn( _( "Part" ), 100, wxALIGN_LEFT, wxCOL_RESIZABLE );
m_tree->AppendColumn( _( "Description" ), 100, wxALIGN_LEFT, wxCOL_RESIZABLE ); m_tree->AppendColumn( _( "Description" ), 100, wxALIGN_LEFT, wxCOL_RESIZABLE );
m_tree->SetRubberBandColumn( 1 ); m_tree->SetRubberBandColumn( 1 );
} }

10
include/widgets/two_column_tree_list.h
View File

@ -27,6 +27,7 @@
*/ */
#include <wx/treelist.h> #include <wx/treelist.h>
#include <map>
#ifndef __two_column_tree_list__ #ifndef __two_column_tree_list__
#define __two_column_tree_list__ #define __two_column_tree_list__
@ -79,8 +80,17 @@ class TWO_COLUMN_TREE_LIST : public wxTreeListCtrl
void OnSize( wxSizeEvent& aEvent ); void OnSize( wxSizeEvent& aEvent );
protected: protected:
/**
* Memoized version of wx WidthFor(), which returns the width in pixels
* required to display a string. This function is REALLY SLOW on macOS.
*/
int MemoWidthFor( const wxString& aStr );
int m_rubber_band_column; int m_rubber_band_column;
int m_clamped_min_width; int m_clamped_min_width;
static std::map<wxString, int> m_width_cache;
}; };
#endif // __two_column_tree_list__ #endif // __two_column_tree_list__