Alpha-blend color with the checkerboard in color swatches.

common/widgets/color_swatch.cpp

@@ -1,7 +1,7 @@
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2017-2021 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2017-2023 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -33,10 +33,6 @@ wxDEFINE_EVENT( COLOR_SWATCH_CHANGED, wxCommandEvent );
 using KIGFX::COLOR4D;
 
 
-// See selcolor.cpp:
-extern COLOR4D DisplayColorFrame( wxWindow* aParent, COLOR4D aOldColor );
-
-
 wxBitmap COLOR_SWATCH::MakeBitmap( const COLOR4D& aColor, const COLOR4D& aBackground,
                                    const wxSize& aSize, const wxSize& aCheckerboardSize,
                                    const COLOR4D& aCheckerboardBackground )
@@ -57,66 +53,68 @@ void COLOR_SWATCH::RenderToDC( wxDC* aDC, const KIGFX::COLOR4D& aColor,
                                const wxSize&         aCheckerboardSize,
                                const KIGFX::COLOR4D& aCheckerboardBackground )
 {
-    wxBrush     brush;
-    wxPen       pen;
+    wxBrush brush;
+    wxPen   pen;
 
     brush.SetStyle( wxBRUSHSTYLE_SOLID );
 
-    if( aColor == COLOR4D::UNSPECIFIED )
+    // Draw a checkerboard
+    COLOR4D white;
+    COLOR4D black;
+    bool    rowCycle;
+
+    if( aCheckerboardBackground.GetBrightness() > 0.4 )
+    {
+        white = COLOR4D::WHITE;
+        black = white.Darkened( 0.15 );
+        rowCycle = true;
+    }
+    else
     {
-        // Draw a checkerboard
-        COLOR4D white;
-        COLOR4D black;
-        bool    rowCycle;
+        black = COLOR4D::BLACK;
+        white = black.Brightened( 0.15 );
+        rowCycle = false;
+    }
 
-        if( aCheckerboardBackground.GetBrightness() > 0.4 )
-        {
-            white = COLOR4D::WHITE;
-            black = white.Darkened( 0.15 );
-            rowCycle = true;
-        }
-        else
-        {
-            black = COLOR4D::BLACK;
-            white = black.Brightened( 0.15 );
-            rowCycle = false;
-        }
+    for( int x = aRect.GetLeft(); x <= aRect.GetRight(); x += aCheckerboardSize.x )
+    {
+        bool colCycle = rowCycle;
 
-        for( int x = aRect.GetLeft(); x < aRect.GetRight(); x += aCheckerboardSize.x )
+        for( int y = aRect.GetTop(); y <= aRect.GetBottom(); y += aCheckerboardSize.y )
         {
-            bool colCycle = rowCycle;
-
-            for( int y = aRect.GetTop(); y < aRect.GetBottom(); y += aCheckerboardSize.y )
-            {
-                COLOR4D color = colCycle ? black : white;
-                brush.SetColour( color.ToColour() );
-                pen.SetColour( color.ToColour() );
+            COLOR4D color = colCycle ? black : white;
+            brush.SetColour( color.ToColour() );
+            pen.SetColour( color.ToColour() );
 
-                aDC->SetBrush( brush );
-                aDC->SetPen( pen );
-                aDC->DrawRectangle( x, y, aCheckerboardSize.x, aCheckerboardSize.y );
+            aDC->SetBrush( brush );
+            aDC->SetPen( pen );
+            aDC->DrawRectangle( x, y, aCheckerboardSize.x, aCheckerboardSize.y );
 
-                colCycle = !colCycle;
-            }
-
-            rowCycle = !rowCycle;
+            colCycle = !colCycle;
         }
+
+        rowCycle = !rowCycle;
     }
-    else
+
+    // Blend fg color with the checkerboard
+    wxColor fg = aColor.ToColour();
+
+    for( int y = aRect.GetTop(); y <= aRect.GetBottom(); y++ )
     {
-        brush.SetColour( aBackground.WithAlpha(1.0).ToColour() );
-        pen.SetColour( aBackground.WithAlpha(1.0).ToColour() );
+        for( int x = aRect.GetLeft(); x <= aRect.GetRight(); x++ )
+        {
+            wxColor bg;
+            aDC->GetPixel( x, y, &bg );
 
-        aDC->SetBrush( brush );
-        aDC->SetPen( pen );
-        aDC->DrawRectangle( aRect );
+            unsigned char r = wxColor::AlphaBlend( fg.Red(), bg.Red(), aColor.a );
+            unsigned char g = wxColor::AlphaBlend( fg.Green(), bg.Green(), aColor.a );
+            unsigned char b = wxColor::AlphaBlend( fg.Blue(), bg.Blue(), aColor.a );
 
-        brush.SetColour( aColor.ToColour() );
-        pen.SetColour( aColor.ToColour() );
+            pen.SetColour( r, g, b );
+            aDC->SetPen( pen );
 
-        aDC->SetBrush( brush );
-        aDC->SetPen( pen );
-        aDC->DrawRectangle( aRect );
+            aDC->DrawPoint( x, y );
+        }
     }
 }