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

Make sure bitmap fallback is only used for non-cached text. 

Also fixes backwards vertical justification for bitmap text.

Fixes https://gitlab.com/kicad/code/kicad/issues/10956
This commit is contained in:
Jeff Young 2022-02-24 18:15:47 +00:00
parent d465eb6425
commit a29968fa91
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1340,8 +1340,6 @@ void OPENGL_GAL::BitmapText( const wxString& aText, const VECTOR2I& aPosition,
switch( GetVerticalJustify() ) switch( GetVerticalJustify() )
{ {
case GR_TEXT_V_ALIGN_TOP: case GR_TEXT_V_ALIGN_TOP:
Translate( VECTOR2D( 0, -textSize.y ) );
overbarHeight = -textSize.y / 2.0;
break; break;
case GR_TEXT_V_ALIGN_CENTER: case GR_TEXT_V_ALIGN_CENTER:
@ -1350,6 +1348,8 @@ void OPENGL_GAL::BitmapText( const wxString& aText, const VECTOR2I& aPosition,
break; break;
case GR_TEXT_V_ALIGN_BOTTOM: case GR_TEXT_V_ALIGN_BOTTOM:
Translate( VECTOR2D( 0, -textSize.y ) );
overbarHeight = -textSize.y / 2.0;
break; break;
} }

18
eeschema/sch_painter.cpp
View File

@ -255,6 +255,14 @@ bool SCH_PAINTER::Draw( const VIEW_ITEM *aItem, int aLayer )
#define BITMAP_FONT_LOD_THRESHOLD 3.5 #define BITMAP_FONT_LOD_THRESHOLD 3.5
bool SCH_PAINTER::nonCached( const EDA_ITEM* aItem )
{
// TODO: it would be nice to have a more definitive test for this, but we've currently got
// no access to the VIEW_GROUP to see if it's cached or not.
return aItem->IsSelected();
}
bool SCH_PAINTER::underLODThreshold( int aFontSize ) bool SCH_PAINTER::underLODThreshold( int aFontSize )
{ {
return aFontSize * m_gal->GetWorldScale() < BITMAP_FONT_LOD_THRESHOLD; return aFontSize * m_gal->GetWorldScale() < BITMAP_FONT_LOD_THRESHOLD;
@ -875,7 +883,7 @@ void SCH_PAINTER::draw( const LIB_FIELD *aField, int aLayer )
attrs.m_Valign = GR_TEXT_V_ALIGN_CENTER; attrs.m_Valign = GR_TEXT_V_ALIGN_CENTER;
attrs.m_StrokeWidth = getTextThickness( aField, drawingShadows ); attrs.m_StrokeWidth = getTextThickness( aField, drawingShadows );
if( underLODThreshold( aField->GetTextHeight() ) ) if( nonCached( aField ) && underLODThreshold( aField->GetTextHeight() ) )
bitmapText( UnescapeString( aField->GetText() ), textpos, attrs ); bitmapText( UnescapeString( aField->GetText() ), textpos, attrs );
else else
strokeText( UnescapeString( aField->GetText() ), textpos, attrs ); strokeText( UnescapeString( aField->GetText() ), textpos, attrs );
@ -943,7 +951,7 @@ void SCH_PAINTER::draw( const LIB_TEXT* aText, int aLayer )
attrs.m_Halign = GR_TEXT_H_ALIGN_CENTER; attrs.m_Halign = GR_TEXT_H_ALIGN_CENTER;
attrs.m_Valign = GR_TEXT_V_ALIGN_CENTER; attrs.m_Valign = GR_TEXT_V_ALIGN_CENTER;
if( underLODThreshold( aText->GetTextHeight() ) ) if( nonCached( aText ) && underLODThreshold( aText->GetTextHeight() ) )
bitmapText( aText->GetText(), pos, attrs ); bitmapText( aText->GetText(), pos, attrs );
else else
strokeText( aText->GetText(), pos, attrs ); strokeText( aText->GetText(), pos, attrs );
@ -1405,7 +1413,7 @@ void SCH_PAINTER::draw( LIB_PIN *aPin, int aLayer )
{ {
boxText( text[i], aPos, attrs ); boxText( text[i], aPos, attrs );
} }
else if( underLODThreshold( size[i] ) ) else if( nonCached( aPin ) && underLODThreshold( size[i] ) )
{ {
bitmapText( text[i], aPos, attrs ); bitmapText( text[i], aPos, attrs );
} }
@ -1830,7 +1838,7 @@ void SCH_PAINTER::draw( const SCH_TEXT *aText, int aLayer )
attrs.m_Angle = aText->GetDrawRotation(); attrs.m_Angle = aText->GetDrawRotation();
attrs.m_StrokeWidth = getTextThickness( aText, drawingShadows ); attrs.m_StrokeWidth = getTextThickness( aText, drawingShadows );
if( underLODThreshold( aText->GetTextHeight() ) ) if( nonCached( aText ) && underLODThreshold( aText->GetTextHeight() ) )
{ {
bitmapText( shownText, aText->GetDrawPos() + text_offset, attrs ); bitmapText( shownText, aText->GetDrawPos() + text_offset, attrs );
} }
@ -2179,7 +2187,7 @@ void SCH_PAINTER::draw( const SCH_FIELD *aField, int aLayer )
attributes.m_StrokeWidth = getTextThickness( aField, drawingShadows ); attributes.m_StrokeWidth = getTextThickness( aField, drawingShadows );
attributes.m_Angle = orient; attributes.m_Angle = orient;
if( underLODThreshold( aField->GetTextHeight() ) ) if( nonCached( aField ) && underLODThreshold( aField->GetTextHeight() ) )
{ {
bitmapText( shownText, textpos, attributes ); bitmapText( shownText, textpos, attributes );
} }

3
eeschema/sch_painter.h
View File

@ -183,6 +183,9 @@ private:
int internalPinDecoSize( const LIB_PIN &aPin ); int internalPinDecoSize( const LIB_PIN &aPin );
int externalPinDecoSize( const LIB_PIN &aPin ); int externalPinDecoSize( const LIB_PIN &aPin );
// Indicates the item is drawn on a non-cached layer in OpenGL
bool nonCached( const EDA_ITEM* aItem );
bool underLODThreshold( int aFontSize ); bool underLODThreshold( int aFontSize );
bool isUnitAndConversionShown( const LIB_ITEM* aItem ) const; bool isUnitAndConversionShown( const LIB_ITEM* aItem ) const;