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

Fix issue with overbars in bitmap text.

This commit is contained in:
Jeff Young 2021-06-12 11:49:12 +01:00
parent 5bb6b1a3cc
commit 9328c78b08
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/gal/opengl/opengl_gal.cpp
View File

@ -1246,17 +1246,14 @@ void OPENGL_GAL::BitmapText( const wxString& aText, const VECTOR2D& aPosition,
if( IsTextMirrored() || aText.Contains( wxT( "^{" ) ) || aText.Contains( wxT( "_{" ) ) ) if( IsTextMirrored() || aText.Contains( wxT( "^{" ) ) || aText.Contains( wxT( "_{" ) ) )
return GAL::BitmapText( aText, aPosition, aRotationAngle ); return GAL::BitmapText( aText, aPosition, aRotationAngle );
const UTF8 text( aText ); const UTF8 text( aText );
// Compute text size, so it can be properly justified VECTOR2D textSize;
VECTOR2D textSize; float commonOffset;
float commonOffset;
std::tie( textSize, commonOffset ) = computeBitmapTextSize( text ); std::tie( textSize, commonOffset ) = computeBitmapTextSize( text );
const double SCALE = 1.4 * GetGlyphSize().y / textSize.y; const double SCALE = 1.4 * GetGlyphSize().y / textSize.y;
bool overbar = false; int overbarLength = 0;
double overbarHeight = textSize.y;
int overbarLength = 0;
double overbarHeight = textSize.y;
Save(); Save();
@ -1347,7 +1344,7 @@ void OPENGL_GAL::BitmapText( const wxString& aText, const VECTOR2D& aPosition,
overbarLength = 0; overbarLength = 0;
} }
if( overbar ) if( overbarDepth >= 0 )
overbarLength += drawBitmapChar( *chIt ); overbarLength += drawBitmapChar( *chIt );
else else
drawBitmapChar( *chIt ); drawBitmapChar( *chIt );
@ -1356,7 +1353,7 @@ void OPENGL_GAL::BitmapText( const wxString& aText, const VECTOR2D& aPosition,
// Handle the case when overbar is active till the end of the drawn text // Handle the case when overbar is active till the end of the drawn text
m_currentManager->Translate( 0, commonOffset, 0 ); m_currentManager->Translate( 0, commonOffset, 0 );
if( overbar && overbarLength > 0 ) if( overbarDepth >= 0 && overbarLength > 0 )
drawBitmapOverbar( overbarLength, overbarHeight ); drawBitmapOverbar( overbarLength, overbarHeight );
Restore(); Restore();