From 466ee6fac8eab145dffb89400ff68d94256c29a5 Mon Sep 17 00:00:00 2001
From: John Beard <john.j.beard@gmail.com>
Date: Wed, 5 Feb 2025 22:01:46 +0800
Subject: [PATCH] Pcbnew: keep alway-on layer checkboxes visible but disabled

THese layers can't be disabled, but hiding the checkboxes
can be misunderstood as the layers are missing, rather than forced on.

E.g.: https://gitlab.com/kicad/code/kicad/-/issues/18756#note_2315214661
---
 pcbnew/dialogs/panel_setup_layers.cpp | 35 +++++++++++++--------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/pcbnew/dialogs/panel_setup_layers.cpp b/pcbnew/dialogs/panel_setup_layers.cpp
index b57fa57ef8..474d3ea688 100644
--- a/pcbnew/dialogs/panel_setup_layers.cpp
+++ b/pcbnew/dialogs/panel_setup_layers.cpp
@@ -47,6 +47,16 @@
 #include <set>
 
 
+/**
+ * Configure a layer checkbox to be mandatory and disabled.
+ */
+static void mandatoryLayerCbSetup( wxCheckBox& aCheckBox )
+{
+    aCheckBox.Show();
+    aCheckBox.Disable();
+    aCheckBox.SetValue( true );
+}
+
 
 PANEL_SETUP_LAYERS::PANEL_SETUP_LAYERS( wxWindow* aParentWindow, PCB_EDIT_FRAME* aFrame ) :
         PANEL_SETUP_LAYERS_BASE( aParentWindow ),
@@ -171,8 +181,7 @@ void PANEL_SETUP_LAYERS::initialize_front_tech_layers()
     m_MaskFrontStaticText->Wrap( -1 );
     m_LayersSizer->Add( m_MaskFrontStaticText, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxLEFT, 5 );
 
-    m_CrtYdFrontCheckBox->SetValue( true);
-    m_CrtYdFrontCheckBox->Hide();
+    mandatoryLayerCbSetup( *m_CrtYdFrontCheckBox );
 }
 
 
@@ -382,14 +391,9 @@ void PANEL_SETUP_LAYERS::initialize_back_tech_layers()
     m_LayersSizer->Add( m_DrawingsStaticText, 0,
                         wxALIGN_CENTER_VERTICAL | wxBOTTOM | wxLEFT | wxRIGHT, 5 );
 
-    // These layers are always enabled, so hide the checkboxes
-    m_CrtYdBackCheckBox->SetValue( true);
-    m_CrtYdBackCheckBox->Hide();
-    m_PCBEdgesCheckBox->SetValue( true);
-    m_PCBEdgesCheckBox->Hide();
-    m_MarginCheckBox->SetValue( true);
-    m_MarginCheckBox->Hide();
-
+    mandatoryLayerCbSetup( *m_CrtYdBackCheckBox );
+    mandatoryLayerCbSetup( *m_PCBEdgesCheckBox );
+    mandatoryLayerCbSetup( *m_MarginCheckBox );
 }
 
 
@@ -658,15 +662,13 @@ void PANEL_SETUP_LAYERS::setCopperLayerCheckBoxes( int copperCount )
     if( copperCount > 0 )
     {
         wxCheckBox* fcu = getCheckBox( F_Cu );
-        fcu->SetValue( true );
-        fcu->Hide();
+        mandatoryLayerCbSetup( *fcu );
     }
 
     if( copperCount > 0 )
     {
         wxCheckBox* bcu = getCheckBox( B_Cu );
-        bcu->SetValue( true );
-        bcu->Hide();
+        mandatoryLayerCbSetup( *bcu );
     }
 
     LSET layers = m_enabledLayers & LSET::AllCuMask( copperCount );
@@ -676,10 +678,7 @@ void PANEL_SETUP_LAYERS::setCopperLayerCheckBoxes( int copperCount )
     for( PCB_LAYER_ID layer : layers )
     {
         wxCheckBox* cb = getCheckBox( layer );
-
-        cb->SetValue( true );
-        cb->Show();
-        cb->Disable();
+        mandatoryLayerCbSetup( *cb );
     }
 
 }