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

Handle justified LIB_TEXT. 

Fixes https://gitlab.com/kicad/code/kicad/issues/11052
This commit is contained in:
Jeff Young 2022-03-06 19:48:36 +00:00
parent 14304215b3
commit 6b3ed89248
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
eeschema/sch_painter.cpp
View File

@ -940,15 +940,39 @@ void SCH_PAINTER::draw( const LIB_TEXT* aText, int aLayer )
TEXT_ATTRIBUTES attrs = aText->GetAttributes();
attrs.m_StrokeWidth = getTextThickness( aText, drawingShadows );
// Because the text position is the bounding box center, the text
// is drawn as centered.
attrs.m_Halign = GR_TEXT_H_ALIGN_CENTER;
if( attrs.m_Angle == ANGLE_VERTICAL )
{
switch( attrs.m_Halign )
{
case GR_TEXT_H_ALIGN_LEFT: pos.y = bBox.GetBottom(); break;
case GR_TEXT_H_ALIGN_CENTER: pos.y = ( bBox.GetTop() + bBox.GetBottom() ) / 2; break;
case GR_TEXT_H_ALIGN_RIGHT: pos.y = bBox.GetTop(); break;
}
}
else
{
switch( attrs.m_Halign )
{
case GR_TEXT_H_ALIGN_LEFT: pos.x = bBox.GetLeft(); break;
case GR_TEXT_H_ALIGN_CENTER: pos.x = ( bBox.GetLeft() + bBox.GetRight() ) / 2; break;
case GR_TEXT_H_ALIGN_RIGHT: pos.x = bBox.GetRight(); break;
}
}
// Because the text vertical position is the bounding box center, the text is drawn as
// vertically centered.
attrs.m_Valign = GR_TEXT_V_ALIGN_CENTER;
if( nonCached( aText ) && underLODThreshold( aText->GetTextHeight() ) )
bitmapText( aText->GetText(), pos, attrs );
if( nonCached( aText )
&& underLODThreshold( aText->GetTextHeight() )
&& !shownText.Contains( wxT( "\n" ) ) )
{
bitmapText( shownText, pos, attrs );
}
else
strokeText( aText->GetText(), pos, attrs );
{
strokeText( shownText, pos, attrs );
}
}
}