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

Default canvas scale setting to automatic on OSX 

Fixes https://gitlab.com/kicad/code/kicad/issues/4652
This commit is contained in:
Ian McInerney 2020-06-12 18:38:37 +01:00
parent a97f14e217
commit 60915fbc76
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/settings/common_settings.cpp
View File

@ -39,15 +39,19 @@ COMMON_SETTINGS::COMMON_SETTINGS() :
m_Appearance(), m_Env(), m_Input(), m_Graphics(), m_System() m_Appearance(), m_Env(), m_Input(), m_Graphics(), m_System()
{ {
// This only effect the first time KiCad is run. The user's setting will be used for all // This only effect the first time KiCad is run. The user's setting will be used for all
// subsequent runs. Menu icons are off by default on OSX and on for all other platforms. // subsequent runs.
// Menu icons are off by default on OSX and on for all other platforms.
// Use automatic canvas scaling on OSX, but not on the other platforms (their detection isn't as good).
#if defined( __WXMAC__ ) #if defined( __WXMAC__ )
bool defaultUseIconsInMenus = false; bool defaultUseIconsInMenus = false;
double canvasScale = 0.0;
#else #else
bool defaultUseIconsInMenus = true; bool defaultUseIconsInMenus = true;
double canvasScale = 1.0;
#endif #endif
m_params.emplace_back( new PARAM<double>( "appearance.canvas_scale", m_params.emplace_back( new PARAM<double>( "appearance.canvas_scale",
&m_Appearance.canvas_scale, 1.0 ) ); &m_Appearance.canvas_scale, canvasScale ) );
m_params.emplace_back( new PARAM<int>( "appearance.icon_scale", m_params.emplace_back( new PARAM<int>( "appearance.icon_scale",
&m_Appearance.icon_scale, 0 ) ); &m_Appearance.icon_scale, 0 ) );
@ -285,4 +289,4 @@ bool COMMON_SETTINGS::MigrateFromLegacy( wxConfigBase* aCfg )
ret &= fromLegacyString( aCfg, "WorkingDir", "system.working_dir" ); ret &= fromLegacyString( aCfg, "WorkingDir", "system.working_dir" );
return ret; return ret;
} }