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

Fix selection shadown drawing for global labels. 

(The border should get shadowed, and the shape should get filled if
m_Selection.fill_shapes is set.)
This commit is contained in:
Jeff Young 2023-06-23 12:00:03 +01:00
parent b47fcac666
commit 1c13f5a0db
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
eeschema/sch_painter.cpp
View File

@ -87,6 +87,7 @@ std::vector<KICAD_T> SCH_PAINTER::g_ScaledSelectionTypes = {
SCH_LINE_T, SCH_LINE_T,
LIB_SHAPE_T, SCH_SHAPE_T, LIB_SHAPE_T, SCH_SHAPE_T,
SCH_BITMAP_T, SCH_BITMAP_T,
SCH_GLOBAL_LABEL_T,
SCH_DIRECTIVE_LABEL_T, SCH_DIRECTIVE_LABEL_T,
LIB_SYMBOL_T, SCH_SYMBOL_T, LIB_SYMBOL_T, SCH_SYMBOL_T,
SCH_SHEET_T, SCH_SHEET_T,
@ -2648,6 +2649,7 @@ void SCH_PAINTER::draw( const SCH_FIELD* aField, int aLayer, bool aDimmed )
void SCH_PAINTER::draw( const SCH_GLOBALLABEL* aLabel, int aLayer ) void SCH_PAINTER::draw( const SCH_GLOBALLABEL* aLabel, int aLayer )
{ {
bool drawingShadows = aLayer == LAYER_SELECTION_SHADOWS; bool drawingShadows = aLayer == LAYER_SELECTION_SHADOWS;
bool drawingDangling = aLayer == LAYER_DANGLING;
if( !drawingShadows || eeconfig()->m_Selection.draw_selected_children ) if( !drawingShadows || eeconfig()->m_Selection.draw_selected_children )
{ {
@ -2671,18 +2673,21 @@ void SCH_PAINTER::draw( const SCH_GLOBALLABEL* aLabel, int aLayer )
for( const VECTOR2I& p : pts ) for( const VECTOR2I& p : pts )
pts2.emplace_back( VECTOR2D( p.x, p.y ) ); pts2.emplace_back( VECTOR2D( p.x, p.y ) );
// The text is drawn inside the graphic shape.
// On Cairo the graphic shape is filled by the background before drawing the text.
// However if the text is selected, it is draw twice: first on LAYER_SELECTION_SHADOWS
// and second on the text layer. The second must not erase the first drawing.
bool fillBg = ( ( aLayer == LAYER_SELECTION_SHADOWS ) || !aLabel->IsSelected() )
&& aLayer != LAYER_DANGLING;
m_gal->SetIsFill( fillBg );
m_gal->SetFillColor( m_schSettings.GetLayerColor( LAYER_SCHEMATIC_BACKGROUND ) );
m_gal->SetIsStroke( true ); m_gal->SetIsStroke( true );
m_gal->SetLineWidth( getTextThickness( aLabel ) ); m_gal->SetLineWidth( getLineWidth( aLabel, drawingShadows ) );
m_gal->SetStrokeColor( color ); m_gal->SetStrokeColor( color );
m_gal->DrawPolyline( pts2 );
if( drawingShadows )
{
m_gal->SetIsFill( eeconfig()->m_Selection.fill_shapes );
m_gal->SetFillColor( color );
m_gal->DrawPolygon( pts2 );
}
else if( !drawingDangling )
{
m_gal->SetIsFill( false );
m_gal->DrawPolyline( pts2 );
}
draw( static_cast<const SCH_TEXT*>( aLabel ), aLayer ); draw( static_cast<const SCH_TEXT*>( aLabel ), aLayer );
} }