Commit c5c65d36 authored by Maciej Suminski's avatar Maciej Suminski
Browse files

Selection box color is put into render settings. Selection layer is removed from active layers.

parent f53dafd4

pcbnew/pcb_painter.cpp

+2 −1
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ void PCB_RENDER_SETTINGS::ImportLegacyColors( COLORS_DESIGN_SETTINGS* aSettings 
    m_layerColors[ITEM_GAL_LAYER( PAD_FR_NETNAMES_VISIBLE )]    = COLOR4D( 0.8, 0.8, 0.8, 0.7 );

    m_layerColors[ITEM_GAL_LAYER( PAD_BK_NETNAMES_VISIBLE )]    = COLOR4D( 0.8, 0.8, 0.8, 0.7 );

    m_layerColors[ITEM_GAL_LAYER( WORKSHEET )]                  = COLOR4D( 0.5, 0.0, 0.0, 1.0 );

    m_layerColors[ITEM_GAL_LAYER( SELECTION )]                  = COLOR4D( 1.0, 1.0, 1.0, 0.5 );



    // Netnames for copper layers

    for( LAYER_NUM layer = FIRST_COPPER_LAYER; layer <= LAST_COPPER_LAYER; ++layer )
@@ -911,6 +912,6 @@ void PCB_PAINTER::drawSelectionBox( const VIEW_ITEM* aItem ) const 


    m_gal->SetIsStroke( false );

    m_gal->SetIsFill( true );

    m_gal->SetFillColor( COLOR4D( 1.0, 1.0, 1.0, 0.5 ) );

    m_gal->SetFillColor( m_pcbSettings->GetLayerColor( ITEM_GAL_LAYER( SELECTION ) ) );

    m_gal->DrawRectangle( boundingBox.GetOrigin(), boundingBox.GetEnd() );

}

pcbnew/pcbframe.cpp

+1 −2
Original line number Diff line number Diff line
@@ -767,8 +767,7 @@ void PCB_EDIT_FRAME::setHighContrastLayer( LAYER_NUM aLayer ) 
        LAYER_NUM layers[] = {

                GetNetnameLayer( aLayer ), ITEM_GAL_LAYER( VIAS_VISIBLE ),

                ITEM_GAL_LAYER( VIAS_HOLES_VISIBLE ), ITEM_GAL_LAYER( PADS_VISIBLE ),

                ITEM_GAL_LAYER( PADS_HOLES_VISIBLE ), ITEM_GAL_LAYER( PADS_NETNAMES_VISIBLE ),

                ITEM_GAL_LAYER( SELECTION )

                ITEM_GAL_LAYER( PADS_HOLES_VISIBLE ), ITEM_GAL_LAYER( PADS_NETNAMES_VISIBLE )

        };



        for( unsigned int i = 0; i < sizeof( layers ) / sizeof( LAYER_NUM ); ++i )