Default console font tweaks

* Lucida Console on Windows
* Menlo on OSX
* Monospace (resolved to whatever Monospace means) on linux
* Added ability to select proportional fonts in settings

1 files changed, 17 insertions, 6 deletions

diff --git a/MultiMC.cpp b/MultiMC.cpp
index b7a68eea..c1af23e0 100644
--- a/MultiMC.cpp
+++ b/MultiMC.cpp
@@ -380,21 +380,32 @@ void MultiMC::initGlobalSettings(bool test_mode)
 	// Remembered state
 	m_settings->registerSetting("LastUsedGroupForNewInstance", QString());
 
-	// in test mode, we don't have UI.
+	QString defaultMonospace;
+#ifdef Q_OS_WIN32
+	defaultMonospace = "Lucida Console";
+#elif Q_OS_MAC
+	defaultMonospace = "Menlo";
+#else
+	defaultMonospace = "Monospace";
+#endif
 	if(!test_mode)
 	{
-		// Console settings
+		// resolve the font so the default actually matches
 		QFont consoleFont;
-		consoleFont.setFamily("");
+		consoleFont.setFamily(defaultMonospace);
 		consoleFont.setStyleHint(QFont::Monospace);
 		consoleFont.setFixedPitch(true);
 		QFontInfo consoleFontInfo(consoleFont);
-		QString consoleFontFamily = consoleFontInfo.family();
-		m_settings->registerSetting("ConsoleFont", consoleFontFamily);
+		QString resolvedDefaultMonospace = consoleFontInfo.family();
+		QFont resolvedFont(resolvedDefaultMonospace);
+		QLOG_DEBUG() << "Detected default console font:" << resolvedDefaultMonospace
+			<< ", substitutions:" << resolvedFont.substitutions().join(',');
+		m_settings->registerSetting("ConsoleFont", resolvedDefaultMonospace);
 	}
 	else
 	{
-		m_settings->registerSetting("ConsoleFont", "Courier");
+		// in test mode, we don't have UI, so we don't do any font resolving
+		m_settings->registerSetting("ConsoleFont", defaultMonospace);
 	}
 
 	// FTB