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

Fix preferences on OSX.

This commit is contained in:
Jeff Young 2021-02-22 10:42:13 +00:00
parent 4fd49cd261
commit 41b8ef85e3
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/widgets/gal_options_panel.cpp
View File

@ -208,10 +208,12 @@ GAL_OPTIONS_PANEL::GAL_OPTIONS_PANEL( wxWindow* aParent, EDA_DRAW_FRAME* aDrawFr
bool GAL_OPTIONS_PANEL::TransferDataToWindow() bool GAL_OPTIONS_PANEL::TransferDataToWindow()
{ {
#ifndef __WXMAC__
if( m_drawFrame->GetCanvas()->GetBackend() == EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL ) if( m_drawFrame->GetCanvas()->GetBackend() == EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL )
m_renderingEngine->SetSelection( 0 ); m_renderingEngine->SetSelection( 0 );
else else
m_renderingEngine->SetSelection( 1 ); m_renderingEngine->SetSelection( 1 );
#endif
m_gridSnapOptions->SetSelection( UTIL::GetConfigForVal( gridSnapConfigVals, m_gridSnapOptions->SetSelection( UTIL::GetConfigForVal( gridSnapConfigVals,
m_galOptions.m_gridSnapping ) ); m_galOptions.m_gridSnapping ) );
@ -247,6 +249,7 @@ bool GAL_OPTIONS_PANEL::TransferDataFromWindow()
m_galOptions.m_forceDisplayCursor = m_forceCursorDisplay->GetValue(); m_galOptions.m_forceDisplayCursor = m_forceCursorDisplay->GetValue();
#ifndef __WXMAC__
EDA_DRAW_PANEL_GAL::GAL_TYPE wantedType = m_renderingEngine->GetSelection() == 0 ? EDA_DRAW_PANEL_GAL::GAL_TYPE wantedType = m_renderingEngine->GetSelection() == 0 ?
EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL : EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL :
EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO; EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO;
@ -254,6 +257,7 @@ bool GAL_OPTIONS_PANEL::TransferDataFromWindow()
if( wantedType != currentType ) if( wantedType != currentType )
m_drawFrame->GetCanvas()->SwitchBackend( wantedType ); m_drawFrame->GetCanvas()->SwitchBackend( wantedType );
#endif
return true; return true;
} }

2
include/widgets/gal_options_panel.h
View File

@ -55,7 +55,9 @@ private:
wxBoxSizer* m_mainSizer; wxBoxSizer* m_mainSizer;
#ifndef __WXMAC__
wxRadioBox* m_renderingEngine; wxRadioBox* m_renderingEngine;
#endif
wxRadioBox* m_gridStyle; wxRadioBox* m_gridStyle;
wxStaticText* l_gridLineWidth; wxStaticText* l_gridLineWidth;