Draw the grid and the grid origin in the grid colour.

Fixes: lp:1749564
* https://bugs.launchpad.net/kicad/+bug/1749564

pcbnew/pcb_draw_panel_gal.cpp

@@ -188,6 +188,7 @@ void PCB_DRAW_PANEL_GAL::UseColorScheme( const COLORS_DESIGN_SETTINGS* aSettings
     KIGFX::PCB_RENDER_SETTINGS* rs;
     rs = static_cast<KIGFX::PCB_RENDER_SETTINGS*>( m_view->GetPainter()->GetSettings() );
     rs->ImportLegacyColors( aSettings );
+    m_gal->SetGridColor( aSettings->GetLayerColor( LAYER_GRID ) );
     m_gal->SetCursorColor( aSettings->GetItemColor( LAYER_CURSOR ) );
 }
 

pcbnew/tools/pcbnew_control.cpp

@@ -251,6 +251,7 @@ void PCBNEW_CONTROL::Reset( RESET_REASON aReason )
     if( aReason == MODEL_RELOAD || aReason == GAL_SWITCH )
     {
         m_gridOrigin->SetPosition( board()->GetGridOrigin() );
+        m_gridOrigin->SetColor( m_frame->GetGridColor() );
         getView()->Remove( m_gridOrigin.get() );
         getView()->Add( m_gridOrigin.get() );
     }