From 548dbb7c29513280ddde81262a5039376ac9f5d0 Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Mon, 26 Aug 2019 21:43:59 -0700 Subject: [PATCH] eeschema: Add highlight color to configurable list The highlight color chosen from the system highlight doesn't always show against the schematic sheet background color. Allowing the user to customize with their KiCad theme makes it configurable on par with other colors. This is stop-gap until we get full color schemes from lp:1678345 --- eeschema/eeschema.cpp | 1 + eeschema/sch_painter.cpp | 3 +-- .../widgets/widget_eeschema_color_config.cpp | 17 +++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp index 3bd373d7c2..f5a1282938 100644 --- a/eeschema/eeschema.cpp +++ b/eeschema/eeschema.cpp @@ -220,6 +220,7 @@ static PARAM_CFG_ARRAY& cfg_params() CLR( "Color4DBrightenedEx", LAYER_BRIGHTENED, COLOR4D( PUREMAGENTA ) ) CLR( "Color4DHiddenEx", LAYER_HIDDEN, COLOR4D( LIGHTGRAY ) ) CLR( "Color4DWorksheetEx", LAYER_WORKSHEET, COLOR4D( RED ) ) + CLR( "Color4DShadowEx", LAYER_SELECTION_SHADOWS, COLOR4D( .4, .7, 1.0, 0.8 ) ) } return ca; diff --git a/eeschema/sch_painter.cpp b/eeschema/sch_painter.cpp index 69c6380fd8..2ef330d6a6 100644 --- a/eeschema/sch_painter.cpp +++ b/eeschema/sch_painter.cpp @@ -237,7 +237,6 @@ float SCH_PAINTER::getShadowWidth() COLOR4D SCH_PAINTER::getRenderColor( const EDA_ITEM* aItem, int aLayer, bool aDrawingShadows ) { static COLOR4D highlightColor( 1.0, 0.3, 0.3, 1.0 ); - static COLOR4D selectionColor = wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHT ); COLOR4D color = m_schSettings.GetLayerColor( aLayer ); @@ -254,7 +253,7 @@ COLOR4D SCH_PAINTER::getRenderColor( const EDA_ITEM* aItem, int aLayer, bool aDr else if( aItem->IsSelected() ) { if( aDrawingShadows ) - color = selectionColor.WithAlpha( 0.8 ); + color = m_schSettings.GetLayerColor( LAYER_SELECTION_SHADOWS ).WithAlpha( 0.8 ); } else if( aItem->IsHighlighted() ) // Cross-probing { diff --git a/eeschema/widgets/widget_eeschema_color_config.cpp b/eeschema/widgets/widget_eeschema_color_config.cpp index 90017cb664..f031d60f58 100644 --- a/eeschema/widgets/widget_eeschema_color_config.cpp +++ b/eeschema/widgets/widget_eeschema_color_config.cpp @@ -88,14 +88,15 @@ static COLORBUTTON sheetColorButtons[] = { }; static COLORBUTTON miscColorButtons[] = { - { _( "ERC warning" ), LAYER_ERC_WARN }, - { _( "ERC error" ), LAYER_ERC_ERR }, - { _( "Brightened" ), LAYER_BRIGHTENED }, - { _( "Hidden items" ), LAYER_HIDDEN }, - { _( "Worksheet" ), LAYER_WORKSHEET }, - { _( "Cursor" ), LAYER_SCHEMATIC_CURSOR }, - { _( "Grid" ), LAYER_SCHEMATIC_GRID }, - { _( "Background" ), LAYER_SCHEMATIC_BACKGROUND }, + { _( "ERC warning" ), LAYER_ERC_WARN }, + { _( "ERC error" ), LAYER_ERC_ERR }, + { _( "Brightened" ), LAYER_BRIGHTENED }, + { _( "Hidden items" ), LAYER_HIDDEN }, + { _( "Worksheet" ), LAYER_WORKSHEET }, + { _( "Cursor" ), LAYER_SCHEMATIC_CURSOR }, + { _( "Grid" ), LAYER_SCHEMATIC_GRID }, + { _( "Background" ), LAYER_SCHEMATIC_BACKGROUND }, + { _( "Selection Highlight" ), LAYER_SELECTION_SHADOWS }, { wxT( "" ), -1 } // Sentinel marking end of list. };