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

Fix brightness factor application for selected items 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/5236
This commit is contained in:
Jon Evans 2020-08-18 20:55:12 -04:00
parent eb9756840d
commit 17066134f4
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcbnew/pcb_painter.cpp
View File

@ -280,7 +280,7 @@ COLOR4D PCB_RENDER_SETTINGS::GetColor( const VIEW_ITEM* aItem, int aLayer ) cons
&& m_activeLayers.count( aLayer ) == 0 ) && m_activeLayers.count( aLayer ) == 0 )
color.Mix( m_layerColors[LAYER_PCB_BACKGROUND], m_hiContrastFactor ); color.Mix( m_layerColors[LAYER_PCB_BACKGROUND], m_hiContrastFactor );
} }
else else if( !item->IsSelected() )
{ {
// Single net highlight mode // Single net highlight mode
if( m_highlightEnabled ) if( m_highlightEnabled )
@ -288,12 +288,13 @@ COLOR4D PCB_RENDER_SETTINGS::GetColor( const VIEW_ITEM* aItem, int aLayer ) cons
: m_layerColorsDark[aLayer]; : m_layerColorsDark[aLayer];
// Return grayish color for non-highlighted layers in the dimmed high contrast mode // Return grayish color for non-highlighted layers in the dimmed high contrast mode
if( m_contrastModeDisplay == HIGH_CONTRAST_MODE::DIMMED && m_activeLayers.count( aLayer ) == 0 ) if( m_contrastModeDisplay == HIGH_CONTRAST_MODE::DIMMED
&& m_activeLayers.count( aLayer ) == 0 )
color = m_hiContrastColor[aLayer]; color = m_hiContrastColor[aLayer];
} }
// For vias, some layers depend on other layers in high contrast mode // For vias, some layers depend on other layers in high contrast mode
if( m_hiContrastEnabled && item->Type() == PCB_VIA_T && if( m_hiContrastEnabled && !item->IsSelected() && item->Type() == PCB_VIA_T &&
( aLayer == LAYER_VIAS_HOLES || ( aLayer == LAYER_VIAS_HOLES ||
aLayer == LAYER_VIA_THROUGH || aLayer == LAYER_VIA_THROUGH ||
aLayer == LAYER_VIA_MICROVIA || aLayer == LAYER_VIA_MICROVIA ||
@ -309,10 +310,8 @@ COLOR4D PCB_RENDER_SETTINGS::GetColor( const VIEW_ITEM* aItem, int aLayer ) cons
viaActiveLayer |= via->IsOnLayer( lay_id ) && pcb->IsLayerVisible( lay_id ); viaActiveLayer |= via->IsOnLayer( lay_id ) && pcb->IsLayerVisible( lay_id );
} }
if( viaActiveLayer ) if( !viaActiveLayer )
color = m_layerColors[aLayer]; color.Darken( 1.0 - m_highlightFactor );
else
color = m_hiContrastColor[aLayer];
} }
// Apply per-type opacity overrides // Apply per-type opacity overrides