haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing merge conflict fixes from cherry picking 402c139957.

This commit is contained in:
Wayne Stambaugh 2023-11-18 11:29:13 -05:00
parent e2d8d53a10
commit 70d7bc2099
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
eeschema/tools/sch_editor_control.cpp
View File

@ -808,7 +808,7 @@ static bool highlightNet( TOOL_MANAGER* aToolMgr, const VECTOR2D& aPosition )
wxString connectionName = ( conn ) ? conn->Name() : wxString( wxS( "" ) ); wxString connectionName = ( conn ) ? conn->Name() : wxString( wxS( "" ) );
if( !conn || connectionName == editFrame->GetHighlightedConnection() ) if( !conn )
{ {
editFrame->SetStatusText( wxT( "" ) ); editFrame->SetStatusText( wxT( "" ) );
editFrame->SendCrossProbeClearHighlight(); editFrame->SendCrossProbeClearHighlight();
@ -817,9 +817,16 @@ static bool highlightNet( TOOL_MANAGER* aToolMgr, const VECTOR2D& aPosition )
} }
else else
{ {
if( connectionName != editFrame->GetHighlightedConnection() )
{
editorControl->SetHighlightBusMembers( false );
editFrame->SetCrossProbeConnection( conn ); editFrame->SetCrossProbeConnection( conn );
editFrame->SetHighlightedConnection( connectionName ); editFrame->SetHighlightedConnection( connectionName );
editorControl->SetHighlightBusMembers( false ); }
else
{
editorControl->SetHighlightBusMembers( !editorControl->GetHighlightBusMembers() );
}
} }
editFrame->UpdateNetHighlightStatus(); editFrame->UpdateNetHighlightStatus();