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

Honour forced transparency for strokes and fills. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16542
This commit is contained in:
Jeff Young 2024-01-07 17:40:34 +00:00
parent 392242b9a4
commit 120937b6b0
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eeschema/sch_painter.cpp
View File

@ -792,6 +792,7 @@ void SCH_PAINTER::draw( const LIB_SYMBOL* aSymbol, int aLayer, bool aDrawFields,
bool SCH_PAINTER::setDeviceColors( const LIB_ITEM* aItem, int aLayer, bool aDimmed ) bool SCH_PAINTER::setDeviceColors( const LIB_ITEM* aItem, int aLayer, bool aDimmed )
{ {
COLOR4D bg = m_schSettings.GetLayerColor( LAYER_SCHEMATIC_BACKGROUND );
const EDA_SHAPE* shape = dynamic_cast<const EDA_SHAPE*>( aItem ); const EDA_SHAPE* shape = dynamic_cast<const EDA_SHAPE*>( aItem );
switch( aLayer ) switch( aLayer )
@ -840,6 +841,10 @@ bool SCH_PAINTER::setDeviceColors( const LIB_ITEM* aItem, int aLayer, bool aDimm
else if( shape && shape->GetFillMode() == FILL_T::FILLED_WITH_COLOR ) else if( shape && shape->GetFillMode() == FILL_T::FILLED_WITH_COLOR )
{ {
COLOR4D fillColour = shape->GetFillColor(); COLOR4D fillColour = shape->GetFillColor();
double transparency = aItem->GetForcedTransparency();
if( transparency > 0.0 )
fillColour = fillColour.WithAlpha( fillColour.a * ( 1.0 - transparency ) );
if( m_schSettings.m_OverrideItemColors ) if( m_schSettings.m_OverrideItemColors )
{ {
@ -847,9 +852,8 @@ bool SCH_PAINTER::setDeviceColors( const LIB_ITEM* aItem, int aLayer, bool aDimm
} }
else if( aDimmed ) else if( aDimmed )
{ {
fillColour = fillColour.Mix( fillColour = fillColour.Mix( bg, 0.5f );
m_schSettings.GetLayerColor( LAYER_SCHEMATIC_BACKGROUND ), 0.5f ); fillColour.Desaturate();
fillColour.Desaturate( );
} }
m_gal->SetFillColor( fillColour ); m_gal->SetFillColor( fillColour );
@ -1254,17 +1258,21 @@ void SCH_PAINTER::draw( const LIB_TEXTBOX* aTextBox, int aLayer, bool aDimmed )
{ {
COLOR4D borderColor = aTextBox->GetStroke().GetColor(); COLOR4D borderColor = aTextBox->GetStroke().GetColor();
LINE_STYLE borderStyle = aTextBox->GetStroke().GetLineStyle(); LINE_STYLE borderStyle = aTextBox->GetStroke().GetLineStyle();
double transparency = aTextBox->GetForcedTransparency();
if( m_schSettings.m_OverrideItemColors || aTextBox->IsBrightened() if( m_schSettings.m_OverrideItemColors || aTextBox->IsBrightened()
|| borderColor == COLOR4D::UNSPECIFIED ) || borderColor == COLOR4D::UNSPECIFIED )
{ {
borderColor = m_schSettings.GetLayerColor( aLayer ); borderColor = m_schSettings.GetLayerColor( aLayer );
if( transparency > 0.0 )
borderColor = borderColor.WithAlpha( borderColor.a * ( 1.0 - transparency ) );
} }
if( aDimmed ) if( aDimmed )
{ {
borderColor.Desaturate( );
borderColor = borderColor.Mix( bg, 0.5f ); borderColor = borderColor.Mix( bg, 0.5f );
borderColor.Desaturate( );
} }
m_gal->SetIsFill( false ); m_gal->SetIsFill( false );