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

Performance improvement in wx_grid column label height calc. 

Don't call GetColLabelValue() repeatedly.  It's expensive as it doesn't
cache the string translations.
This commit is contained in:
Jeff Young 2020-03-23 17:00:49 +00:00
parent c4aed3a8de
commit 14788eec94
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/widgets/wx_grid.cpp
View File

@ -269,28 +269,24 @@ int WX_GRID::GetVisibleWidth( int aCol, bool aHeader, bool aContents, bool aKeep
void WX_GRID::EnsureColLabelsVisible() void WX_GRID::EnsureColLabelsVisible()
{ {
int row_height = GetColLabelSize(); // The 1.1 scale factor is due to the fact row labels use a bold font, bigger than
// The 1.1 scale factor is due to the fact row labels use a bold font, bigger than the normal font // the normal font
// TODO: use a better way to evaluate the text size, for bold font // TODO: use a better way to evaluate the text size, for bold font
int line_height = int( GetTextExtent( "Mj" ).y * 1.1 ) + 3;
int row_height = GetColLabelSize();
// Headers can be multiline. Fix the Column Label Height to show the full header // Headers can be multiline. Fix the Column Label Height to show the full header
// However GetTextExtent does not work on multiline strings, // However GetTextExtent does not work on multiline strings,
// and do not return the full text height (only the height of one line) // and do not return the full text height (only the height of one line)
for( int col = 0; col < GetNumberCols(); col++ ) for( int col = 0; col < GetNumberCols(); col++ )
{ {
int nl_count = 0; int nl_count = GetColLabelValue( col ).Freq( '\n' );
for( unsigned ii = 0; ii < GetColLabelValue( col ).size(); ii++ )
if( GetColLabelValue( col )[ii] == '\n' )
nl_count++;
if( nl_count ) if( nl_count )
{ {
// calculate a reasonable text height and its margin
int heigth = int( GetTextExtent( "Mj" ).y * 1.1 ) + 3;
// Col Label height must be able to show nl_count+1 lines // Col Label height must be able to show nl_count+1 lines
if( row_height < heigth * (nl_count+1) ) if( row_height < line_height * ( nl_count+1 ) )
row_height += heigth*nl_count; row_height += line_height * nl_count;
} }
} }