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

pcb_calculator: Update bitmaps on color code panel when theme changes 

They aren't actually different between light and dark currently, but
this brings it inline with all other bitmaps.
This commit is contained in:
Ian McInerney 2021-10-09 22:58:57 +01:00
parent 6620831d38
commit bd0fb5ca89
2 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pcb_calculator/calculator_panels/panel_color_code.cpp
View File

@ -28,7 +28,6 @@ PANEL_COLOR_CODE::PANEL_COLOR_CODE( wxWindow* parent, wxWindowID id,
long style, const wxString& name ) :
PANEL_COLOR_CODE_BASE( parent, id, pos, size, style, name )
{
initColorCodePanel();
ToleranceSelection( m_rbToleranceSelection->GetSelection() );
// Needed on wxWidgets 3.0 to ensure sizers are correctly set
@ -38,16 +37,20 @@ PANEL_COLOR_CODE::PANEL_COLOR_CODE( wxWindow* parent, wxWindowID id,
PANEL_COLOR_CODE::~PANEL_COLOR_CODE()
{
delete m_ccValueNamesBitmap;
delete m_ccValuesBitmap;
delete m_ccMultipliersBitmap;
delete m_ccTolerancesBitmap;
}
void PANEL_COLOR_CODE::ThemeChanged()
{
// Nothing to do for this panel
// Update the bitmaps
m_Band1bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value_and_name ) );
m_Band2bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value ) );
m_Band3bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value ) );
m_Band4bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value ) );
m_Band_mult_bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_multiplier ) );
m_Band_tol_bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_tolerance ) );
Refresh();
}
@ -64,15 +67,6 @@ void PANEL_COLOR_CODE::SaveSettings( PCB_CALCULATOR_SETTINGS* aCfg )
}
void PANEL_COLOR_CODE::initColorCodePanel()
{
m_ccValueNamesBitmap = KiBitmapNew( BITMAPS::color_code_value_and_name );
m_ccValuesBitmap = KiBitmapNew( BITMAPS::color_code_value );
m_ccMultipliersBitmap = KiBitmapNew( BITMAPS::color_code_multiplier );
m_ccTolerancesBitmap = KiBitmapNew( BITMAPS::color_code_tolerance );
}
void PANEL_COLOR_CODE::OnToleranceSelection( wxCommandEvent& event )
{
ToleranceSelection( event.GetSelection() );
@ -94,12 +88,12 @@ void PANEL_COLOR_CODE::ToleranceSelection( int aSelection )
GetSizer()->Layout();
// All this shouldn't be necessary but if you want the bitmaps to show up on OSX it is.
m_Band1bitmap->SetBitmap( *m_ccValueNamesBitmap );
m_Band2bitmap->SetBitmap( *m_ccValuesBitmap );
m_Band3bitmap->SetBitmap( *m_ccValuesBitmap );
m_Band4bitmap->SetBitmap( *m_ccValuesBitmap );
m_Band_mult_bitmap->SetBitmap( *m_ccMultipliersBitmap );
m_Band_tol_bitmap->SetBitmap( *m_ccTolerancesBitmap );
m_Band1bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value_and_name ) );
m_Band2bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value ) );
m_Band3bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value ) );
m_Band4bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_value ) );
m_Band_mult_bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_multiplier ) );
m_Band_tol_bitmap->SetBitmap( KiBitmap( BITMAPS::color_code_tolerance ) );
Refresh();
}

8
pcb_calculator/calculator_panels/panel_color_code.h
View File

@ -40,14 +40,6 @@ public:
void LoadSettings( PCB_CALCULATOR_SETTINGS* aCfg ) override;
void SaveSettings( PCB_CALCULATOR_SETTINGS* aCfg ) override;
void ThemeChanged() override;
private:
void initColorCodePanel();
wxBitmap* m_ccValueNamesBitmap;
wxBitmap* m_ccValuesBitmap;
wxBitmap* m_ccMultipliersBitmap;
wxBitmap* m_ccTolerancesBitmap;
};
#endif