Schematic: remove more extraneous dangling symbols
This commit is contained in:
parent
ceaca1b9ca
commit
bd5d10cd7b
|
@ -1687,11 +1687,10 @@ void SCH_PAINTER::draw( const SCH_LINE *aLine, int aLayer )
|
|||
float width = getLineWidth( aLine, drawingShadows );
|
||||
PLOT_DASH_TYPE lineStyle = aLine->GetEffectiveLineStyle();
|
||||
|
||||
if( drawingDangling || drawingShadows )
|
||||
if( ( drawingDangling || drawingShadows ) && !aLine->IsNew() )
|
||||
{
|
||||
if( ( aLine->IsWire() && aLine->IsStartDangling() )
|
||||
|| ( drawingShadows && aLine->IsSelected() && !aLine->IsNew()
|
||||
&& !aLine->HasFlag( STARTPOINT ) ) )
|
||||
|| ( drawingShadows && aLine->IsSelected() && !aLine->HasFlag( STARTPOINT ) ) )
|
||||
{
|
||||
COLOR4D danglingColor =
|
||||
( drawingShadows && !aLine->HasFlag( STARTPOINT ) ) ? color.Inverted() : color;
|
||||
|
@ -1702,8 +1701,7 @@ void SCH_PAINTER::draw( const SCH_LINE *aLine, int aLayer )
|
|||
}
|
||||
|
||||
if( ( aLine->IsWire() && aLine->IsEndDangling() )
|
||||
|| ( drawingShadows && aLine->IsSelected() && !aLine->IsNew()
|
||||
&& !aLine->HasFlag( ENDPOINT ) ) )
|
||||
|| ( drawingShadows && aLine->IsSelected() && !aLine->HasFlag( ENDPOINT ) ) )
|
||||
{
|
||||
COLOR4D danglingColor =
|
||||
( drawingShadows && !aLine->HasFlag( ENDPOINT ) ) ? color.Inverted() : color;
|
||||
|
@ -1712,11 +1710,11 @@ void SCH_PAINTER::draw( const SCH_LINE *aLine, int aLayer )
|
|||
aLine->IsWire() && aLine->IsEndDangling(), drawingShadows,
|
||||
aLine->IsBrightened() );
|
||||
}
|
||||
|
||||
if( drawingDangling )
|
||||
return;
|
||||
}
|
||||
|
||||
if( drawingDangling )
|
||||
return;
|
||||
|
||||
m_gal->SetIsStroke( true );
|
||||
m_gal->SetStrokeColor( color );
|
||||
m_gal->SetLineWidth( width );
|
||||
|
|
|
@ -322,14 +322,6 @@ void SCH_MOVE_TOOL::orthoLineDrag( SCH_LINE* line, const VECTOR2I& splitDelta, i
|
|||
splitDelta.y ? splitDelta.y : yMove ) );
|
||||
}
|
||||
|
||||
// Update the dangling state of our original line to not show a dangling
|
||||
// end since it is now connected. This doesn't effect anything but is more
|
||||
// consistent visually
|
||||
std::vector<DANGLING_END_ITEM> endPoints;
|
||||
b->GetEndPoints( endPoints );
|
||||
line->UpdateDanglingState( endPoints );
|
||||
updateItem( line, true );
|
||||
|
||||
// Update our cache of the connected items. First, attach our drag labels to the line
|
||||
// left behind.
|
||||
for( EDA_ITEM* candidate : m_lineConnectionCache[line] )
|
||||
|
|
Loading…
Reference in New Issue