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

Increase bounding box of stroke text and the leader box of all text. 

Fixes https://gitlab.com/kicad/code/kicad/issues/13009
This commit is contained in:
Jeff Young 2022-11-27 15:26:41 +00:00
parent 70a038877e
commit 740e193871
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/font/font.cpp
View File

@ -287,11 +287,11 @@ VECTOR2I FONT::StringBoundaryLimits( const wxString& aText, const VECTOR2I& aSiz
if( IsStroke() ) if( IsStroke() )
{ {
// Inflate by a bit more than thickness/2 to catch diacriticals, descenders, etc. // Inflate by a bit more than thickness/2 to catch diacriticals, descenders, etc.
boundingBox.Inflate( KiROUND( aThickness * 0.75 ) ); boundingBox.Inflate( KiROUND( aThickness * 1.5 ) );
} }
else if( IsOutline() ) else if( IsOutline() )
{ {
// Outline fonts have thickness built in // Outline fonts have thickness built in, and *usually* stay within their ascent/descent
} }
return boundingBox.GetSize(); return boundingBox.GetSize();

2
pcbnew/pcb_dimension.cpp
View File

@ -997,7 +997,7 @@ void PCB_DIM_LEADER::updateGeometry()
// Now that we have the text updated, we can determine how to draw the second line // Now that we have the text updated, we can determine how to draw the second line
// First we need to create an appropriate bounding polygon to collide with // First we need to create an appropriate bounding polygon to collide with
BOX2I textBox = m_text.GetTextBox().Inflate( m_text.GetTextWidth() / 2, BOX2I textBox = m_text.GetTextBox().Inflate( m_text.GetTextWidth() / 2,
m_text.GetEffectiveTextPenWidth() ); m_text.GetEffectiveTextPenWidth() * 1.8 );
SHAPE_POLY_SET polyBox; SHAPE_POLY_SET polyBox;
polyBox.NewOutline(); polyBox.NewOutline();