Fix Monospace font lookup

trikset · Feb 15, 2021 · 852b5e2 · 852b5e2
1 parent 31cc2ad
commit 852b5e2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/qrtranslations/fr/qrutils_fr.ts b/qrtranslations/fr/qrutils_fr.ts
@@ -442,7 +442,7 @@
 <context>
     <name>qReal::ui::ConsoleDock</name>
     <message>
-        <location filename="../../qrutils/widgets/consoleDock.cpp" line="+50"/>
+        <location filename="../../qrutils/widgets/consoleDock.cpp" line="+54"/>
         <source>Reset shell</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/qrtranslations/ru/qrutils_ru.ts b/qrtranslations/ru/qrutils_ru.ts
@@ -554,7 +554,7 @@
 <context>
     <name>qReal::ui::ConsoleDock</name>
     <message>
-        <location filename="../../qrutils/widgets/consoleDock.cpp" line="+50"/>
+        <location filename="../../qrutils/widgets/consoleDock.cpp" line="+54"/>
         <source>Reset shell</source>
         <translation>Очистить консоль</translation>
     </message>

diff --git a/qrutils/widgets/consoleDock.cpp b/qrutils/widgets/consoleDock.cpp
@@ -30,7 +30,7 @@ ConsoleDock::ConsoleDock(const QString &title, QWidget *parent)
 	: QDockWidget(title, parent)
 	, mOutput(new QPlainTextEdit(this))
 {
-	QFont font("Monospace");
+	QFont font("");
 	font.setStyleHint(QFont::Monospace);
 	bool ok;
 	auto size = qReal::SettingsManager::value("CustomDockTextSize").toInt(&ok);
@@ -40,7 +40,11 @@ ConsoleDock::ConsoleDock(const QString &title, QWidget *parent)
 
 	mOutput->setFont(font);
 	if (!QFontInfo(mOutput->font()).fixedPitch()) {
-		QLOG_ERROR() << "Not monospaced font was choosen " << font.toString();
+		const auto &font1 = mOutput->font();
+		font.setStyleHint(QFont::TypeWriter);
+		mOutput->setFont(font);
+		const auto &font2 = mOutput->font();
+		QLOG_ERROR() << "Not monospaced font was choosen (" << font1 << "), trying to fallback to" << font2;
 	}
 	setWidget(mOutput);
 	mOutput->setReadOnly(false);