AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-21 00:21:25 +00:00
Files Issues Releases Activity

Revert "Don't allow netclass highlighting to override net highlighting"

Browse Source 
This commit had different issues with selected but netclass-highlighted
wires.

This reverts commit a216369d72.
This commit is contained in:
JamesJCode 2024-12-30 00:36:26 +00:00
parent a216369d72
commit 870b2ec0c5
2 changed files with 4 additions and 4 deletions

3
eeschema/dialogs/panel_eeschema_display_options.cpp
View File

@ -115,8 +115,7 @@ bool PANEL_EESCHEMA_DISPLAY_OPTIONS::TransferDataFromWindow()
cfg->m_Selection.selection_thickness = KiROUND( m_selWidthCtrl->GetValue() );
cfg->m_Selection.highlight_thickness = KiROUND( m_highlightWidthCtrl->GetValue() );
cfg->m_Selection.highlight_netclass_colors = m_highlightNetclassColors->GetValue();
cfg->m_Selection.highlight_netclass_colors_thickness =
KiROUND( m_colHighlightThickness->GetValue() );
cfg->m_Selection.highlight_netclass_colors_thickness = m_colHighlightThickness->GetValue();
cfg->m_Selection.highlight_netclass_colors_alpha =
m_colHighlightTransparency->GetValue() / 100.0;

5
eeschema/sch_painter.cpp
View File

@ -487,7 +487,8 @@ float SCH_PAINTER::getLineWidth( const SCH_ITEM* aItem, bool aDrawingShadows,
if( aDrawingShadows && aItem->IsType( g_ScaledSelectionTypes ) )
width += getShadowWidth( aItem->IsBrightened() );
}
else if( aDrawingWireColorHighlights )
if( aDrawingWireColorHighlights )
{
float colorHighlightWidth = schIUScale.MilsToIU( 15.0 );
EESCHEMA_SETTINGS* eeschemaCfg = eeconfig();
@ -1332,7 +1333,7 @@ void SCH_PAINTER::draw( const SCH_LINE* aLine, int aLayer )
float width = getLineWidth( aLine, drawingShadows, drawingNetColorHighlights );
LINE_STYLE lineStyle = aLine->GetEffectiveLineStyle();
if( highlightNetclassColors && !aLine->IsBrightened() )
if( highlightNetclassColors )
{
// Force default color for nets we are going to highlight
if( drawingWires )