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

Fix some missing swatch background colours in EEschema dialogs.

This commit is contained in:
Jeff Young 2022-09-05 12:43:08 +01:00
parent 3e257794c0
commit 9e8e241924
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eeschema/dialogs/dialog_junction_props.cpp
View File

@ -35,6 +35,9 @@ DIALOG_JUNCTION_PROPS::DIALOG_JUNCTION_PROPS( SCH_EDIT_FRAME* aParent,
{ {
m_colorSwatch->SetDefaultColor( COLOR4D::UNSPECIFIED ); m_colorSwatch->SetDefaultColor( COLOR4D::UNSPECIFIED );
KIGFX::COLOR4D canvas = m_frame->GetColorSettings()->GetColor( LAYER_SCHEMATIC_BACKGROUND );
m_colorSwatch->SetSwatchBackground( canvas.ToColour() );
m_helpLabel1->SetFont( KIUI::GetInfoFont( this ).Italic() ); m_helpLabel1->SetFont( KIUI::GetInfoFont( this ).Italic() );
m_helpLabel2->SetFont( KIUI::GetInfoFont( this ).Italic() ); m_helpLabel2->SetFont( KIUI::GetInfoFont( this ).Italic() );

3
eeschema/dialogs/dialog_line_properties.cpp
View File

@ -40,6 +40,9 @@ DIALOG_LINE_PROPERTIES::DIALOG_LINE_PROPERTIES( SCH_EDIT_FRAME* aParent,
{ {
m_colorSwatch->SetDefaultColor( COLOR4D::UNSPECIFIED ); m_colorSwatch->SetDefaultColor( COLOR4D::UNSPECIFIED );
KIGFX::COLOR4D canvas = m_frame->GetColorSettings()->GetColor( LAYER_SCHEMATIC_BACKGROUND );
m_colorSwatch->SetSwatchBackground( canvas.ToColour() );
m_helpLabel1->SetFont( KIUI::GetInfoFont( this ).Italic() ); m_helpLabel1->SetFont( KIUI::GetInfoFont( this ).Italic() );
m_helpLabel2->SetFont( KIUI::GetInfoFont( this ).Italic() ); m_helpLabel2->SetFont( KIUI::GetInfoFont( this ).Italic() );

4
eeschema/dialogs/dialog_shape_properties.cpp
View File

@ -50,6 +50,10 @@ DIALOG_SHAPE_PROPERTIES::DIALOG_SHAPE_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_S
m_fillColorSwatch->SetDefaultColor( COLOR4D::UNSPECIFIED ); m_fillColorSwatch->SetDefaultColor( COLOR4D::UNSPECIFIED );
KIGFX::COLOR4D canvas = m_frame->GetColorSettings()->GetColor( LAYER_SCHEMATIC_BACKGROUND );
m_borderColorSwatch->SetSwatchBackground( canvas.ToColour() );
m_fillColorSwatch->SetSwatchBackground( canvas.ToColour() );
if( m_frame->GetColorSettings()->GetOverrideSchItemColors() ) if( m_frame->GetColorSettings()->GetOverrideSchItemColors() )
m_infoBar->ShowMessage( _( "Note: individual item colors overridden in Preferences." ) ); m_infoBar->ShowMessage( _( "Note: individual item colors overridden in Preferences." ) );

3
eeschema/dialogs/dialog_wire_bus_properties.cpp
View File

@ -43,6 +43,9 @@ DIALOG_WIRE_BUS_PROPERTIES::DIALOG_WIRE_BUS_PROPERTIES( SCH_EDIT_FRAME* aParent,
{ {
m_colorSwatch->SetDefaultColor( COLOR4D::UNSPECIFIED ); m_colorSwatch->SetDefaultColor( COLOR4D::UNSPECIFIED );
KIGFX::COLOR4D canvas = m_frame->GetColorSettings()->GetColor( LAYER_SCHEMATIC_BACKGROUND );
m_colorSwatch->SetSwatchBackground( canvas.ToColour() );
m_helpLabel1->SetFont( KIUI::GetInfoFont( this ).Italic() ); m_helpLabel1->SetFont( KIUI::GetInfoFont( this ).Italic() );
m_helpLabel2->SetFont( KIUI::GetInfoFont( this ).Italic() ); m_helpLabel2->SetFont( KIUI::GetInfoFont( this ).Italic() );