From f8b157a1fbe83768e3579799bd2f9d8ec44fa8c5 Mon Sep 17 00:00:00 2001
From: Mike Williams <mike@mikebwilliams.com>
Date: Wed, 20 Jul 2022 14:46:30 -0400
Subject: [PATCH] PCB: Bitmaps should respect layer opacity and highlighting
 options

Fixes: https://gitlab.com/kicad/code/kicad/-/issues/12045
---
 pcbnew/pcb_painter.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pcbnew/pcb_painter.cpp b/pcbnew/pcb_painter.cpp
index 6f1b0e6213..9e71011d77 100644
--- a/pcbnew/pcb_painter.cpp
+++ b/pcbnew/pcb_painter.cpp
@@ -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 ) )
                 color = COLOR4D::CLEAR;
             else
+            {
                 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 );
     }
     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();