From c5683ea73dee10022d4d64ecd8eab09b27d8b9ea Mon Sep 17 00:00:00 2001
From: Jon Evans <jon@craftyjon.com>
Date: Wed, 13 Nov 2024 19:38:02 -0500
Subject: [PATCH] Fix ordering of color settings after layer ID changes

---
 pcbnew/dialogs/panel_pcbnew_color_settings.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pcbnew/dialogs/panel_pcbnew_color_settings.cpp b/pcbnew/dialogs/panel_pcbnew_color_settings.cpp
index 15d0e7aa8e..6ac9159f60 100644
--- a/pcbnew/dialogs/panel_pcbnew_color_settings.cpp
+++ b/pcbnew/dialogs/panel_pcbnew_color_settings.cpp
@@ -23,6 +23,7 @@
 #include <pgm_base.h>
 #include <board.h>
 #include <layer_ids.h>
+#include <layer_range.h>
 #include <gal/graphics_abstraction_layer.h>
 #include <panel_pcbnew_color_settings.h>
 #include <math/vector2wx.h>
@@ -760,8 +761,13 @@ void PANEL_PCBNEW_COLOR_SETTINGS::createSwatches()
                } );
 
     // Don't sort aBoard layers by name
-    for( int i = PCBNEW_LAYER_ID_START; i <= User_9; ++i )
-        m_validLayers.insert( m_validLayers.begin() + i, i );
+    size_t i = 0;
+
+    for( PCB_LAYER_ID layer : LAYER_RANGE( F_Cu, B_Cu, MAX_CU_LAYERS ) )
+        m_validLayers.insert( m_validLayers.begin() + i++, layer );
+
+    for( PCB_LAYER_ID layer : LSET::AllNonCuMask().TechAndUserUIOrder() )
+        m_validLayers.insert( m_validLayers.begin() + i++, layer );
 
     for( int layer : m_validLayers )
     {