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

Eeschema: fix position of shadow shape of graphic texts in a footprint. 

Fixes #15019
https://gitlab.com/kicad/code/kicad/-/issues/15019
This commit is contained in:
jean-pierre charras 2023-08-03 13:55:07 +02:00
parent e2aa3aae8a
commit 8649a3e340
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
eeschema/sch_painter.cpp
View File

@ -1135,25 +1135,38 @@ void SCH_PAINTER::draw( const LIB_TEXT* aText, int aLayer, bool aDimmed )
attrs.m_StrokeWidth = KiROUND( getTextThickness( aText ) ); attrs.m_StrokeWidth = KiROUND( getTextThickness( aText ) );
// Due to the fact a shadow text can be drawn left or right aligned,
// it needs an offset = shadowWidth/2 to be drawn at the same place as normal text
// texts drawn as GR_TEXT_H_ALIGN_CENTER do not need a specific offset.
// this offset is shadowWidth/2 but for some reason we need to slightly modify this offset
// for a better look (better alignment of shadow shape), for KiCad font only
double shadowOffset = 0.0;
if( drawingShadows ) if( drawingShadows )
{
double shadowWidth = getShadowWidth( !aText->IsSelected() );
attrs.m_StrokeWidth += getShadowWidth( !aText->IsSelected() ); attrs.m_StrokeWidth += getShadowWidth( !aText->IsSelected() );
const double adjust = 1.2f; // Value chosen after tests
shadowOffset = shadowWidth/2.0f * adjust;
}
if( attrs.m_Angle == ANGLE_VERTICAL ) if( attrs.m_Angle == ANGLE_VERTICAL )
{ {
switch( attrs.m_Halign ) switch( attrs.m_Halign )
{ {
case GR_TEXT_H_ALIGN_LEFT: pos.y = bBox.GetBottom(); break; case GR_TEXT_H_ALIGN_LEFT: pos.y = bBox.GetBottom() + shadowOffset; break;
case GR_TEXT_H_ALIGN_CENTER: pos.y = ( bBox.GetTop() + bBox.GetBottom() ) / 2; 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; case GR_TEXT_H_ALIGN_RIGHT: pos.y = bBox.GetTop() - shadowOffset; break;
} }
} }
else else
{ {
switch( attrs.m_Halign ) switch( attrs.m_Halign )
{ {
case GR_TEXT_H_ALIGN_LEFT: pos.x = bBox.GetLeft(); break; case GR_TEXT_H_ALIGN_LEFT: pos.x = bBox.GetLeft() - shadowOffset; break;
case GR_TEXT_H_ALIGN_CENTER: pos.x = ( bBox.GetLeft() + bBox.GetRight() ) / 2; 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; case GR_TEXT_H_ALIGN_RIGHT: pos.x = bBox.GetRight() + shadowOffset; break;
} }
} }