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

Fixed text vertical alignment for bitmap font (OpenGL).

This commit is contained in:
Maciej Suminski 2016-05-03 11:58:48 +02:00
parent 2f874097ae
commit 8d952f35c6
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -697,8 +697,10 @@ void OPENGL_GAL::BitmapText( const wxString& aText, const VECTOR2D& aPosition,
// Compute text size, so it can be properly justified // Compute text size, so it can be properly justified
VECTOR2D textSize = computeBitmapTextSize( aText ); std::pair<VECTOR2D, int> bbox = computeBitmapTextSize( aText );
const double SCALE = GetGlyphSize().y / textSize.y * 2.0; VECTOR2D textSize = bbox.first;
int commonOffset = bbox.second;
const double SCALE = GetGlyphSize().y / textSize.y;
int tildas = 0; int tildas = 0;
bool overbar = false; bool overbar = false;
@ -711,6 +713,7 @@ void OPENGL_GAL::BitmapText( const wxString& aText, const VECTOR2D& aPosition,
currentManager->Translate( aPosition.x, aPosition.y, layerDepth ); currentManager->Translate( aPosition.x, aPosition.y, layerDepth );
currentManager->Rotate( aRotationAngle, 0.0f, 0.0f, -1.0f ); currentManager->Rotate( aRotationAngle, 0.0f, 0.0f, -1.0f );
currentManager->Scale( SCALE, SCALE, 0 ); currentManager->Scale( SCALE, SCALE, 0 );
currentManager->Translate( 0, -commonOffset, 0 );
switch( GetHorizontalJustify() ) switch( GetHorizontalJustify() )
{ {
@ -733,12 +736,12 @@ void OPENGL_GAL::BitmapText( const wxString& aText, const VECTOR2D& aPosition,
{ {
case GR_TEXT_VJUSTIFY_TOP: case GR_TEXT_VJUSTIFY_TOP:
Translate( VECTOR2D( 0, -textSize.y ) ); Translate( VECTOR2D( 0, -textSize.y ) );
overbarHeight = 0; overbarHeight = -textSize.y / 2.0;
break; break;
case GR_TEXT_VJUSTIFY_CENTER: case GR_TEXT_VJUSTIFY_CENTER:
Translate( VECTOR2D( 0, -textSize.y / 2.0 ) ); Translate( VECTOR2D( 0, -textSize.y / 2.0 ) );
overbarHeight = 0; //textSize.y; overbarHeight = 0;
break; break;
case GR_TEXT_VJUSTIFY_BOTTOM: case GR_TEXT_VJUSTIFY_BOTTOM:
@ -1342,9 +1345,10 @@ void OPENGL_GAL::drawBitmapOverbar( double aLength, double aHeight )
} }
VECTOR2D OPENGL_GAL::computeBitmapTextSize( const wxString& aText ) const std::pair<VECTOR2D, int> OPENGL_GAL::computeBitmapTextSize( const wxString& aText ) const
{ {
VECTOR2D textSize( 0, 0 ); VECTOR2D textSize( 0, 0 );
int commonOffset = std::numeric_limits<int>::max();
bool wasTilda = false; bool wasTilda = false;
for( unsigned int i = 0; i < aText.length(); ++i ) for( unsigned int i = 0; i < aText.length(); ++i )
@ -1368,10 +1372,13 @@ VECTOR2D OPENGL_GAL::computeBitmapTextSize( const wxString& aText ) const
const bitmap_glyph& GLYPH = bitmap_chars[aText[i]]; const bitmap_glyph& GLYPH = bitmap_chars[aText[i]];
textSize.x += ( GLYPH.x_off + GLYPH.width ); textSize.x += ( GLYPH.x_off + GLYPH.width );
textSize.y = std::max( (unsigned int)( textSize.y ), GLYPH.y_off * 2 + GLYPH.height ); textSize.y = std::max( (unsigned int)( textSize.y ), GLYPH.height + GLYPH.y_off );
commonOffset= std::min( GLYPH.y_off, commonOffset );
} }
return textSize; textSize.y -= commonOffset;
return std::make_pair( textSize, commonOffset );
} }

5
include/gal/opengl/opengl_gal.h
View File

@ -369,9 +369,10 @@ private:
* @brief Computes a size of text drawn using bitmap font with current text setting applied. * @brief Computes a size of text drawn using bitmap font with current text setting applied.
* *
* @param aText is the text to be drawn. * @param aText is the text to be drawn.
* @return Text size expressed in world coordinates. * @return Pair containing text bounding box and common Y axis offset. The values are expressed
* as a number of pixels on the bitmap font texture and need to be scaled before drawing.
*/ */
VECTOR2D computeBitmapTextSize( const wxString& aText ) const; std::pair<VECTOR2D, int> computeBitmapTextSize( const wxString& aText ) const;
// Event handling // Event handling
/** /**