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

PCB: Bitmaps should respect layer opacity and highlighting options 

Fixes: https://gitlab.com/kicad/code/kicad/-/issues/12045
This commit is contained in:
Mike Williams 2022-07-20 14:46:30 -04:00
parent 7386e64923
commit f8b157a1fb
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcbnew/pcb_painter.cpp
View File

@ -331,7 +331,14 @@ COLOR4D PCB_RENDER_SETTINGS::GetColor( const VIEW_ITEM* aItem, int aLayer ) cons
if( m_ContrastModeDisplay == HIGH_CONTRAST_MODE::HIDDEN || IsNetnameLayer( aLayer ) ) if( m_ContrastModeDisplay == HIGH_CONTRAST_MODE::HIDDEN || IsNetnameLayer( aLayer ) )
color = COLOR4D::CLEAR; color = COLOR4D::CLEAR;
else else
{
color = color.Mix( m_layerColors[LAYER_PCB_BACKGROUND], m_hiContrastFactor ); color = color.Mix( m_layerColors[LAYER_PCB_BACKGROUND], m_hiContrastFactor );
// Bitmaps can't have their color mixed so just reduce the opacity a bit so they
// show through less
if( item->Type() == PCB_BITMAP_T )
color.a *= m_hiContrastFactor;
}
} }
} }
@ -1693,7 +1700,8 @@ void PCB_PAINTER::draw( const PCB_BITMAP* aBitmap, int aLayer )
m_gal->DrawBitmap( *aBitmap->GetImage(), 1.0 ); m_gal->DrawBitmap( *aBitmap->GetImage(), 1.0 );
} }
else else
m_gal->DrawBitmap( *aBitmap->GetImage(), m_pcbSettings.m_imageOpacity ); m_gal->DrawBitmap( *aBitmap->GetImage(),
m_pcbSettings.GetColor( aBitmap, aBitmap->GetLayer() ).a );
m_gal->Restore(); m_gal->Restore();