Revert "Fix issue with colours in the new lazy-loaded preference panels."
This reverts commit c33b3fd314
.
This commit is contained in:
parent
7b0d45402a
commit
e967020ebe
|
@ -58,12 +58,6 @@ public:
|
|||
if( show )
|
||||
Resolve();
|
||||
|
||||
// m_contents has been created as a child window of LAZY_PAGE, and has been added to
|
||||
// LAZY_PAGE's m_mainSizer. So wxPanel::Show() should call m_contents' Show() method,
|
||||
// whether overridden or not. Only it doesn't, so we call it directly here.
|
||||
if( show && m_contents )
|
||||
m_contents->Show( true );
|
||||
|
||||
return wxPanel::Show( show );
|
||||
}
|
||||
|
||||
|
|
|
@ -68,11 +68,9 @@ void PANEL_EESCHEMA_EDITING_OPTIONS::loadEEschemaSettings( EESCHEMA_SETTINGS* aC
|
|||
COLOR4D schematicBackground = settings->GetColor( LAYER_SCHEMATIC_BACKGROUND );
|
||||
|
||||
m_borderColorSwatch->SetSwatchBackground( schematicBackground );
|
||||
m_borderColorSwatch->SetDefaultColor( settings->GetDefaultColor( LAYER_SHEET ) );
|
||||
m_borderColorSwatch->SetSwatchColor( aCfg->m_Drawing.default_sheet_border_color, false );
|
||||
|
||||
m_backgroundColorSwatch->SetSwatchBackground( schematicBackground );
|
||||
m_backgroundColorSwatch->SetDefaultColor( settings->GetDefaultColor( LAYER_SHEET_BACKGROUND ) );
|
||||
m_backgroundColorSwatch->SetSwatchColor( aCfg->m_Drawing.default_sheet_background_color, false );
|
||||
|
||||
m_choiceLineMode->SetSelection( aCfg->m_Drawing.line_mode );
|
||||
|
|
Loading…
Reference in New Issue