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

WX_GRID::GetVisibleWidth(): fix column label height of our wxGrid, for multiline column labels

This commit is contained in:
jean-pierre charras 2019-02-18 17:19:00 +01:00
parent 5af8d2d0a8
commit 692fab2b73
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/widgets/wx_grid.cpp
View File

@ -245,6 +245,25 @@ int WX_GRID::GetVisibleWidth( int aCol, bool aHeader, bool aContents, bool aKeep
{ {
// The 1.1 scale factor is due to the fact headers use a bold font, bigger than the normal font // The 1.1 scale factor is due to the fact headers use a bold font, bigger than the normal font
size = std::max( size, int( GetTextExtent( GetColLabelValue( aCol ) + "M" ).x * 1.1 ) ); size = std::max( size, int( GetTextExtent( GetColLabelValue( aCol ) + "M" ).x * 1.1 ) );
// Headers can be multiline. Fix the Column Label Height to show the full header
// However GetTextExtent does not work on multiline strings,
// and do not return the full text height (only the height of one line)
int nl_count = 0;
for( unsigned ii = 0; ii < GetColLabelValue( aCol ).size(); ii++ )
if( GetColLabelValue( aCol )[ii] == '\n' )
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
if( GetColLabelSize() < heigth * (nl_count+1) )
SetColLabelSize( GetColLabelSize() + heigth*nl_count );
}
} }
for( int row = 0; aContents && row < GetNumberRows(); row++ ) for( int row = 0; aContents && row < GetNumberRows(); row++ )