From bda0a73c633e285c01db82f1f8cf7d42d0a0bec7 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Fri, 24 May 2024 21:26:05 +0100
Subject: [PATCH] Set swatch background colors.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/17564
---
 eeschema/dialogs/dialog_table_properties.cpp     | 4 ++++
 eeschema/dialogs/dialog_tablecell_properties.cpp | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/eeschema/dialogs/dialog_table_properties.cpp b/eeschema/dialogs/dialog_table_properties.cpp
index e5ca7a7f82..c7fac4c293 100644
--- a/eeschema/dialogs/dialog_table_properties.cpp
+++ b/eeschema/dialogs/dialog_table_properties.cpp
@@ -105,6 +105,10 @@ DIALOG_TABLE_PROPERTIES::DIALOG_TABLE_PROPERTIES( SCH_EDIT_FRAME* aFrame, SCH_TA
     m_borderStyleCombo->Append( DEFAULT_STYLE );
     m_separatorsStyleCombo->Append( DEFAULT_STYLE );
 
+    KIGFX::COLOR4D canvas = aFrame->GetColorSettings()->GetColor( LAYER_SCHEMATIC_BACKGROUND );
+    m_borderColorSwatch->SetSwatchBackground( canvas );
+    m_separatorsColorSwatch->SetSwatchBackground( canvas );
+
     if( m_frame->GetColorSettings()->GetOverrideSchItemColors() )
         m_infoBar->ShowMessage( _( "Note: individual item colors overridden in Preferences." ) );
 
diff --git a/eeschema/dialogs/dialog_tablecell_properties.cpp b/eeschema/dialogs/dialog_tablecell_properties.cpp
index cc80a9f476..0073cf950f 100644
--- a/eeschema/dialogs/dialog_tablecell_properties.cpp
+++ b/eeschema/dialogs/dialog_tablecell_properties.cpp
@@ -68,6 +68,10 @@ DIALOG_TABLECELL_PROPERTIES::DIALOG_TABLECELL_PROPERTIES( SCH_EDIT_FRAME* aFrame
     m_vAlignBottom->SetIsRadioButton();
     m_vAlignBottom->SetBitmap( KiBitmapBundle( BITMAPS::text_valign_bottom ) );
 
+    KIGFX::COLOR4D canvas = aFrame->GetColorSettings()->GetColor( LAYER_SCHEMATIC_BACKGROUND );
+    m_textColorSwatch->SetSwatchBackground( canvas );
+    m_fillColorSwatch->SetSwatchBackground( canvas );
+
     SetupStandardButtons();
     Layout();