From 19fb1a92cedaaacca4d96f4c130571a82bf565ac Mon Sep 17 00:00:00 2001 From: Jon Evans Date: Tue, 13 Oct 2020 21:26:56 -0400 Subject: [PATCH] Expose grid axes color control Note: axis thickness is currently calculated from grid line thickness. I'm not adding a separate control for it as requested in the original issue right now, but if we determine that we need a separate control it can be added. Fixes https://gitlab.com/kicad/code/kicad/-/issues/2353 --- pcbnew/dialogs/panel_modedit_color_settings.cpp | 1 - pcbnew/dialogs/panel_pcbnew_color_settings.cpp | 1 - pcbnew/pcb_draw_panel_gal.cpp | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pcbnew/dialogs/panel_modedit_color_settings.cpp b/pcbnew/dialogs/panel_modedit_color_settings.cpp index c988a8feaa..259073e12c 100644 --- a/pcbnew/dialogs/panel_modedit_color_settings.cpp +++ b/pcbnew/dialogs/panel_modedit_color_settings.cpp @@ -65,7 +65,6 @@ PANEL_MODEDIT_COLOR_SETTINGS::PANEL_MODEDIT_COLOR_SETTINGS( FOOTPRINT_EDIT_FRAME for( int id = GAL_LAYER_ID_START; id < GAL_LAYER_ID_END; id++ ) { if( id == LAYER_VIAS - || id == LAYER_GRID_AXES || id == LAYER_PADS_PLATEDHOLES || id == LAYER_VIAS_HOLES ) { diff --git a/pcbnew/dialogs/panel_pcbnew_color_settings.cpp b/pcbnew/dialogs/panel_pcbnew_color_settings.cpp index cb13366ee4..5df106a502 100644 --- a/pcbnew/dialogs/panel_pcbnew_color_settings.cpp +++ b/pcbnew/dialogs/panel_pcbnew_color_settings.cpp @@ -354,7 +354,6 @@ std::string g_previewBoard = std::set g_excludedLayers = { LAYER_VIAS, - LAYER_GRID_AXES, LAYER_MOD_FR, LAYER_MOD_BK, LAYER_MOD_VALUES, diff --git a/pcbnew/pcb_draw_panel_gal.cpp b/pcbnew/pcb_draw_panel_gal.cpp index 49b2fb7687..c4d4bd8b4d 100644 --- a/pcbnew/pcb_draw_panel_gal.cpp +++ b/pcbnew/pcb_draw_panel_gal.cpp @@ -251,6 +251,7 @@ void PCB_DRAW_PANEL_GAL::UpdateColors() rs->LoadColors( cs ); m_gal->SetGridColor( cs->GetColor( LAYER_GRID ) ); + m_gal->SetAxesColor( cs->GetColor( LAYER_GRID_AXES ) ); m_gal->SetCursorColor( cs->GetColor( LAYER_CURSOR ) ); }