electron-rare/kicad-source-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move default font to RENDER_SETTINGS.

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/issues/12723
This commit is contained in:
Jeff Young
2022-10-22 21:32:42 +01:00
parent d78b41969f
commit cef7cd8f7c
39 changed files with 323 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcbnew/plot_brditems_plotter.cpp
+19 -5
View File
@@ -402,9 +402,16 @@ void BRDITEMS_PLOTTER::PlotFootprintTextItem( const FP_TEXT* aText, const COLOR4
m_plotter->SetColor( color );
// calculate some text parameters :
VECTOR2I size = aText->GetTextSize();
VECTOR2I pos = aText->GetTextPos();
int thickness = aText->GetEffectiveTextPenWidth();
VECTOR2I size = aText->GetTextSize();
VECTOR2I pos = aText->GetTextPos();
int thickness = aText->GetEffectiveTextPenWidth();
KIFONT::FONT* font = aText->GetFont();
if( !font )
{
font = KIFONT::FONT::GetFont( m_plotter->RenderSettings()->GetDefaultFont(),
aText->IsBold(), aText->IsItalic() );
}
if( aText->IsMirrored() )
size.x = -size.x; // Text is mirrored
@@ -428,7 +435,7 @@ void BRDITEMS_PLOTTER::PlotFootprintTextItem( const FP_TEXT* aText, const COLOR4
m_plotter->Text( pos, aColor, aText->GetShownText(), aText->GetDrawRotation(), size,
aText->GetHorizJustify(), aText->GetVertJustify(), thickness,
aText->IsItalic(), allow_bold, false, aText->GetDrawFont(), &gbr_metadata );
aText->IsItalic(), allow_bold, false, font, &gbr_metadata );
}
@@ -779,8 +786,15 @@ void BRDITEMS_PLOTTER::PlotFootprintShape( const FP_SHAPE* aShape )
void BRDITEMS_PLOTTER::PlotPcbText( const EDA_TEXT* aText, PCB_LAYER_ID aLayer, bool aIsKnockout )
{
KIFONT::FONT* font = aText->GetFont();
if( !font )
{
font = KIFONT::FONT::GetFont( m_plotter->RenderSettings()->GetDefaultFont(),
aText->IsBold(), aText->IsItalic() );
}
wxString shownText( aText->GetShownText() );
KIFONT::FONT* font = aText->GetDrawFont();
TEXT_ATTRIBUTES attrs = aText->GetAttributes();
if( shownText.IsEmpty() )