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

Put device-coloured fills on device layer. 

Fixes https://gitlab.com/kicad/code/kicad/issues/10993
This commit is contained in:
Jeff Young 2022-02-28 21:10:28 +00:00
parent 69a6033905
commit 4dc652497d
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
eeschema/sch_painter.cpp
View File

@ -630,7 +630,7 @@ bool SCH_PAINTER::setDeviceColors( const LIB_ITEM* aItem, int aLayer )
COLOR4D fillColor; COLOR4D fillColor;
if( shape->GetFillMode() == FILL_T::FILLED_SHAPE ) if( shape->GetFillMode() == FILL_T::FILLED_SHAPE )
fillColor = getRenderColor( aItem, LAYER_DEVICE, false ); return false; // rendered on LAYER_NOTES or LAYER_DEVICE
else if( shape->GetFillMode() == FILL_T::FILLED_WITH_BG_BODYCOLOR ) else if( shape->GetFillMode() == FILL_T::FILLED_WITH_BG_BODYCOLOR )
fillColor = getRenderColor( aItem, LAYER_DEVICE_BACKGROUND, false ); fillColor = getRenderColor( aItem, LAYER_DEVICE_BACKGROUND, false );
else if( shape->GetFillMode() == FILL_T::FILLED_WITH_COLOR ) else if( shape->GetFillMode() == FILL_T::FILLED_WITH_COLOR )
@ -763,29 +763,23 @@ void SCH_PAINTER::draw( const LIB_SHAPE *aShape, int aLayer )
} }
else if( aLayer == LAYER_DEVICE_BACKGROUND || aLayer == LAYER_NOTES_BACKGROUND ) else if( aLayer == LAYER_DEVICE_BACKGROUND || aLayer == LAYER_NOTES_BACKGROUND )
{ {
if( aShape->IsFilled() ) if( aShape->GetFillMode() == FILL_T::FILLED_WITH_BG_BODYCOLOR
|| aShape->GetFillMode() == FILL_T::FILLED_WITH_COLOR )
{ {
m_gal->SetIsFill( true ); m_gal->SetIsFill( true );
m_gal->SetIsStroke( false ); m_gal->SetIsStroke( false );
if( aShape->GetFillColor() == COLOR4D::UNSPECIFIED )
{
if( aShape->GetFillMode() == FILL_T::FILLED_SHAPE )
m_gal->SetFillColor( getRenderColor( aShape, LAYER_DEVICE, false ) );
else
m_gal->SetFillColor( color );
}
else
{
m_gal->SetFillColor( aShape->GetFillColor() );
}
drawShape( aShape ); drawShape( aShape );
} }
} }
else if( aLayer == LAYER_DEVICE else if( aLayer == LAYER_DEVICE || ( m_schSettings.m_IsSymbolEditor && aLayer == LAYER_NOTES ) )
|| ( m_schSettings.m_IsSymbolEditor && aLayer == LAYER_NOTES ) )
{ {
if( aShape->GetFillMode() == FILL_T::FILLED_SHAPE )
{
m_gal->SetIsFill( true );
m_gal->SetIsStroke( false );
drawShape( aShape );
}
int lineWidth = getLineWidth( aShape, drawingShadows ); int lineWidth = getLineWidth( aShape, drawingShadows );
if( lineWidth > 0 ) if( lineWidth > 0 )