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

Used dimmed setting for pin texts and textbox borders. 

Fixes https://gitlab.com/kicad/code/kicad/issues/12705
This commit is contained in:
Jeff Young 2022-10-21 22:42:09 +01:00
parent c9ce8da10a
commit 0de540594a
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
eeschema/sch_painter.cpp
View File

@ -763,7 +763,7 @@ bool SCH_PAINTER::setDeviceColors( const LIB_ITEM* aItem, int aLayer, bool aDimm
} }
void SCH_PAINTER::draw( const LIB_SHAPE *aShape, int aLayer, bool aDNP ) void SCH_PAINTER::draw( const LIB_SHAPE *aShape, int aLayer, bool aDimmed )
{ {
if( !isUnitAndConversionShown( aShape ) ) if( !isUnitAndConversionShown( aShape ) )
return; return;
@ -771,12 +771,12 @@ void SCH_PAINTER::draw( const LIB_SHAPE *aShape, int aLayer, bool aDNP )
if( aShape->IsPrivate() && !m_schSettings.m_IsSymbolEditor ) if( aShape->IsPrivate() && !m_schSettings.m_IsSymbolEditor )
return; return;
if( !setDeviceColors( aShape, aLayer, aDNP ) ) if( !setDeviceColors( aShape, aLayer, aDimmed ) )
return; return;
bool drawingShadows = aLayer == LAYER_SELECTION_SHADOWS; bool drawingShadows = aLayer == LAYER_SELECTION_SHADOWS;
PLOT_DASH_TYPE lineStyle = aShape->GetStroke().GetPlotStyle(); PLOT_DASH_TYPE lineStyle = aShape->GetStroke().GetPlotStyle();
COLOR4D color = getRenderColor( aShape, aLayer, drawingShadows, aDNP ); COLOR4D color = getRenderColor( aShape, aLayer, drawingShadows, aDimmed );
auto drawShape = auto drawShape =
[&]( const LIB_SHAPE* shape ) [&]( const LIB_SHAPE* shape )
@ -1069,6 +1069,7 @@ void SCH_PAINTER::draw( const LIB_TEXTBOX* aTextBox, int aLayer, bool aDimmed )
if( drawingShadows && !( aTextBox->IsBrightened() || aTextBox->IsSelected() ) ) if( drawingShadows && !( aTextBox->IsBrightened() || aTextBox->IsSelected() ) )
return; return;
COLOR4D bg = m_schSettings.GetLayerColor( LAYER_SCHEMATIC_BACKGROUND );
COLOR4D color = getRenderColor( aTextBox, aLayer, drawingShadows, aDimmed ); COLOR4D color = getRenderColor( aTextBox, aLayer, drawingShadows, aDimmed );
float borderWidth = getLineWidth( aTextBox, drawingShadows ); float borderWidth = getLineWidth( aTextBox, drawingShadows );
@ -1123,6 +1124,9 @@ void SCH_PAINTER::draw( const LIB_TEXTBOX* aTextBox, int aLayer, bool aDimmed )
borderColor = m_schSettings.GetLayerColor( aLayer ); borderColor = m_schSettings.GetLayerColor( aLayer );
} }
if( aDimmed )
borderColor = borderColor.Mix( bg, 0.5f );
m_gal->SetIsFill( false ); m_gal->SetIsFill( false );
m_gal->SetIsStroke( true ); m_gal->SetIsStroke( true );
m_gal->SetStrokeColor( borderColor ); m_gal->SetStrokeColor( borderColor );
@ -1421,12 +1425,12 @@ void SCH_PAINTER::draw( const LIB_PIN *aPin, int aLayer, bool aDimmed )
{ {
size [INSIDE] = showPinNames ? aPin->GetNameTextSize() : 0; size [INSIDE] = showPinNames ? aPin->GetNameTextSize() : 0;
thickness[INSIDE] = nameStrokeWidth; thickness[INSIDE] = nameStrokeWidth;
colour [INSIDE] = getRenderColor( aPin, LAYER_PINNAM, drawingShadows ); colour [INSIDE] = getRenderColor( aPin, LAYER_PINNAM, drawingShadows, aDimmed );
text [INSIDE] = aPin->GetShownName(); text [INSIDE] = aPin->GetShownName();
size [ABOVE] = showPinNumbers ? aPin->GetNumberTextSize() : 0; size [ABOVE] = showPinNumbers ? aPin->GetNumberTextSize() : 0;
thickness[ABOVE] = numStrokeWidth; thickness[ABOVE] = numStrokeWidth;
colour [ABOVE] = getRenderColor( aPin, LAYER_PINNUM, drawingShadows ); colour [ABOVE] = getRenderColor( aPin, LAYER_PINNUM, drawingShadows, aDimmed );
text [ABOVE] = aPin->GetShownNumber(); text [ABOVE] = aPin->GetShownNumber();
} }
// Otherwise pin NAMES go above and pin NUMBERS go below // Otherwise pin NAMES go above and pin NUMBERS go below
@ -1434,12 +1438,12 @@ void SCH_PAINTER::draw( const LIB_PIN *aPin, int aLayer, bool aDimmed )
{ {
size [ABOVE] = showPinNames ? aPin->GetNameTextSize() : 0; size [ABOVE] = showPinNames ? aPin->GetNameTextSize() : 0;
thickness[ABOVE] = nameStrokeWidth; thickness[ABOVE] = nameStrokeWidth;
colour [ABOVE] = getRenderColor( aPin, LAYER_PINNAM, drawingShadows ); colour [ABOVE] = getRenderColor( aPin, LAYER_PINNAM, drawingShadows, aDimmed );
text [ABOVE] = aPin->GetShownName(); text [ABOVE] = aPin->GetShownName();
size [BELOW] = showPinNumbers ? aPin->GetNumberTextSize() : 0; size [BELOW] = showPinNumbers ? aPin->GetNumberTextSize() : 0;
thickness[BELOW] = numStrokeWidth; thickness[BELOW] = numStrokeWidth;
colour [BELOW] = getRenderColor( aPin, LAYER_PINNUM, drawingShadows ); colour [BELOW] = getRenderColor( aPin, LAYER_PINNUM, drawingShadows, aDimmed );
text [BELOW] = aPin->GetShownNumber(); text [BELOW] = aPin->GetShownNumber();
} }
@ -1447,7 +1451,7 @@ void SCH_PAINTER::draw( const LIB_PIN *aPin, int aLayer, bool aDimmed )
{ {
size[OUTSIDE] = std::max( aPin->GetNameTextSize() * 3 / 4, schIUScale.mmToIU( 0.7 ) ); size[OUTSIDE] = std::max( aPin->GetNameTextSize() * 3 / 4, schIUScale.mmToIU( 0.7 ) );
thickness[OUTSIDE] = float( size[OUTSIDE] ) / 8.0F; thickness[OUTSIDE] = float( size[OUTSIDE] ) / 8.0F;
colour [OUTSIDE] = getRenderColor( aPin, LAYER_PRIVATE_NOTES, drawingShadows ); colour [OUTSIDE] = getRenderColor( aPin, LAYER_PRIVATE_NOTES, drawingShadows, aDimmed );
text [OUTSIDE] = aPin->GetElectricalTypeName(); text [OUTSIDE] = aPin->GetElectricalTypeName();
} }
@ -1465,7 +1469,7 @@ void SCH_PAINTER::draw( const LIB_PIN *aPin, int aLayer, bool aDimmed )
if( !aPin->IsVisible() ) if( !aPin->IsVisible() )
{ {
for( COLOR4D& c : colour ) for( COLOR4D& c : colour )
c = getRenderColor( aPin, LAYER_HIDDEN, drawingShadows ); c = getRenderColor( aPin, LAYER_HIDDEN, drawingShadows, aDimmed );
} }
float insideOffset = textOffset - thickness[INSIDE] / 2.0; float insideOffset = textOffset - thickness[INSIDE] / 2.0;

3
eeschema/sch_painter.h
View File

@ -183,7 +183,8 @@ private:
bool isUnitAndConversionShown( const LIB_ITEM* aItem ) const; bool isUnitAndConversionShown( const LIB_ITEM* aItem ) const;
float getShadowWidth( bool aForHighlight ) const; float getShadowWidth( bool aForHighlight ) const;
COLOR4D getRenderColor( const EDA_ITEM* aItem, int aLayer, bool aDrawingShadows, bool aDimmed = false ) const; COLOR4D getRenderColor( const EDA_ITEM* aItem, int aLayer, bool aDrawingShadows,
bool aDimmed = false ) const;
float getLineWidth( const EDA_ITEM* aItem, bool aDrawingShadows ) const; float getLineWidth( const EDA_ITEM* aItem, bool aDrawingShadows ) const;
float getTextThickness( const EDA_ITEM* aItem ) const; float getTextThickness( const EDA_ITEM* aItem ) const;