pcbnew: Apply display settings on canvas switch (GAL canvas).

pcbnew/pcb_draw_panel_gal.cpp

@@ -55,22 +55,6 @@ const LAYER_NUM GAL_LAYER_ORDER[] =
     NETNAMES_GAL_LAYER( F_Cu ), F_Cu,
     F_SilkS, F_Paste, F_Adhes,
 
-#if 0   // was:
-    NETNAMES_GAL_LAYER( LAYER_15_NETNAMES_VISIBLE ), LAYER_N_15,
-    NETNAMES_GAL_LAYER( LAYER_14_NETNAMES_VISIBLE ), LAYER_N_14,
-    NETNAMES_GAL_LAYER( LAYER_13_NETNAMES_VISIBLE ), LAYER_N_13,
-    NETNAMES_GAL_LAYER( LAYER_12_NETNAMES_VISIBLE ), LAYER_N_12,
-    NETNAMES_GAL_LAYER( LAYER_11_NETNAMES_VISIBLE ), LAYER_N_11,
-    NETNAMES_GAL_LAYER( LAYER_10_NETNAMES_VISIBLE ), LAYER_N_10,
-    NETNAMES_GAL_LAYER( LAYER_9_NETNAMES_VISIBLE ), LAYER_N_9,
-    NETNAMES_GAL_LAYER( LAYER_8_NETNAMES_VISIBLE ), LAYER_N_8,
-    NETNAMES_GAL_LAYER( LAYER_7_NETNAMES_VISIBLE ), LAYER_N_7,
-    NETNAMES_GAL_LAYER( LAYER_6_NETNAMES_VISIBLE ), LAYER_N_6,
-    NETNAMES_GAL_LAYER( LAYER_5_NETNAMES_VISIBLE ), LAYER_N_5,
-    NETNAMES_GAL_LAYER( LAYER_4_NETNAMES_VISIBLE ), LAYER_N_4,
-    NETNAMES_GAL_LAYER( LAYER_3_NETNAMES_VISIBLE ), LAYER_N_3,
-    NETNAMES_GAL_LAYER( LAYER_2_NETNAMES_VISIBLE ), LAYER_N_2,
-#else
     NETNAMES_GAL_LAYER( In1_Cu ),   In1_Cu,
     NETNAMES_GAL_LAYER( In2_Cu ),   In2_Cu,
     NETNAMES_GAL_LAYER( In3_Cu ),   In3_Cu,
@@ -101,7 +85,7 @@ const LAYER_NUM GAL_LAYER_ORDER[] =
     NETNAMES_GAL_LAYER( In28_Cu ),  In28_Cu,
     NETNAMES_GAL_LAYER( In29_Cu ),  In29_Cu,
     NETNAMES_GAL_LAYER( In30_Cu ),  In30_Cu,
-#endif
+
     NETNAMES_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE ), ITEM_GAL_LAYER( PAD_BK_VISIBLE ), B_Mask,
     NETNAMES_GAL_LAYER( B_Cu ), B_Cu,
 
@@ -214,6 +198,7 @@ void PCB_DRAW_PANEL_GAL::DisplayBoard( const BOARD* aBoard )
     m_view->Add( m_ratsnest );
 
     UseColorScheme( aBoard->GetColorsSettings() );
+    static_cast<KIGFX::PCB_RENDER_SETTINGS*>( m_view->GetPainter()->GetSettings() )->LoadDisplayOptions( DisplayOpt );
 
     m_view->RecacheAllItems( true );
 }