From c08f482ed41087a6e86bff937a58c2c508641067 Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Sun, 21 May 2023 13:55:00 +0200
Subject: [PATCH] Eeschema, panel color settings: minor fix: ensure color
 swatches are show/hidden according to the option Override Colors state.

---
 eeschema/dialogs/panel_eeschema_color_settings.cpp | 12 +++++++++---
 eeschema/dialogs/panel_eeschema_color_settings.h   |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/eeschema/dialogs/panel_eeschema_color_settings.cpp b/eeschema/dialogs/panel_eeschema_color_settings.cpp
index d227ed49ff..509e326bfb 100644
--- a/eeschema/dialogs/panel_eeschema_color_settings.cpp
+++ b/eeschema/dialogs/panel_eeschema_color_settings.cpp
@@ -223,6 +223,7 @@ void PANEL_EESCHEMA_COLOR_SETTINGS::createSwatches()
 
     m_colorsMainSizer->Layout();
 
+    updateAllowedSwatches();
     createPreviewItems();
     updatePreview();
     zoomFitPreview();
@@ -519,10 +520,8 @@ void PANEL_EESCHEMA_COLOR_SETTINGS::OnSize( wxSizeEvent& aEvent )
 }
 
 
-void PANEL_EESCHEMA_COLOR_SETTINGS::OnOverrideItemColorsClicked( wxCommandEvent& aEvent )
+void PANEL_EESCHEMA_COLOR_SETTINGS::updateAllowedSwatches()
 {
-    m_currentSettings->SetOverrideSchItemColors( m_optOverrideColors->GetValue() );
-
     // If the theme is not overriding individual item colors then don't show them so that
     // the user doesn't get seduced into thinking they'll have some effect.
     m_labels[ LAYER_SHEET ]->Show( m_currentSettings->GetOverrideSchItemColors() );
@@ -534,3 +533,10 @@ void PANEL_EESCHEMA_COLOR_SETTINGS::OnOverrideItemColorsClicked( wxCommandEvent&
     m_colorsGridSizer->Layout();
     m_colorsListWindow->Layout();
 }
+
+
+void PANEL_EESCHEMA_COLOR_SETTINGS::OnOverrideItemColorsClicked( wxCommandEvent& aEvent )
+{
+    m_currentSettings->SetOverrideSchItemColors( m_optOverrideColors->GetValue() );
+    updateAllowedSwatches();
+}
diff --git a/eeschema/dialogs/panel_eeschema_color_settings.h b/eeschema/dialogs/panel_eeschema_color_settings.h
index ca840cbae3..6ce8dba84a 100644
--- a/eeschema/dialogs/panel_eeschema_color_settings.h
+++ b/eeschema/dialogs/panel_eeschema_color_settings.h
@@ -61,6 +61,7 @@ private:
     void createPreviewItems();
 
     void updatePreview();
+    void updateAllowedSwatches();
     void zoomFitPreview();
 
 private: