From fcd1b923b387d9caa9dbadc28d3cc8af03a43b9c Mon Sep 17 00:00:00 2001 From: Lee Matos Date: Sat, 12 Jul 2025 16:14:25 -0400 Subject: [PATCH] Gui: Fix #12199 missing font family Courier on MacOS --- src/Gui/Icons/VarSet.svg | 4 ++-- src/Gui/PythonConsole.cpp | 3 ++- src/Gui/ReportView.cpp | 7 +++---- src/Gui/TextEdit.cpp | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Gui/Icons/VarSet.svg b/src/Gui/Icons/VarSet.svg index 9c5448eeb2..04a0940537 100644 --- a/src/Gui/Icons/VarSet.svg +++ b/src/Gui/Icons/VarSet.svg @@ -200,7 +200,7 @@ &rCaller, const char * sR } else if (strcmp(sReason, "FontSize") == 0 || strcmp(sReason, "Font") == 0) { int fontSize = rclGrp.GetInt("FontSize", 10); - QString fontFamily = QString::fromLatin1(rclGrp.GetASCII("Font", "Courier").c_str()); - - QFont font(fontFamily, fontSize); + QFont font = QFontDatabase::systemFont(QFontDatabase::FixedFont); + font.setPointSize(fontSize); setFont(font); QFontMetrics metric(font); int width = QtTools::horizontalAdvance(metric, QLatin1String("0000")); diff --git a/src/Gui/TextEdit.cpp b/src/Gui/TextEdit.cpp index c11d081101..26d23f6497 100644 --- a/src/Gui/TextEdit.cpp +++ b/src/Gui/TextEdit.cpp @@ -281,7 +281,8 @@ TextEditor::TextEditor(QWidget* parent) d = new TextEditorP(); lineNumberArea = new LineMarker(this); - QFont serifFont(QLatin1String("Courier"), 10, QFont::Normal); + QFont serifFont = QFontDatabase::systemFont(QFontDatabase::FixedFont); + serifFont.setPointSize(10); setFont(serifFont); ParameterGrp::handle hPrefGrp = getWindowParameter(); @@ -447,9 +448,8 @@ void TextEditor::OnChange(Base::Subject &rCaller,const char* sReaso #else int fontSize = hPrefGrp->GetInt("FontSize", 10); #endif - QString fontFamily = QString::fromLatin1(hPrefGrp->GetASCII( "Font", "Courier" ).c_str()); - - QFont font(fontFamily, fontSize); + QFont font = QFontDatabase::systemFont(QFontDatabase::FixedFont); + font.setPointSize(fontSize); setFont(font); lineNumberArea->setFont(font); }