From a63cbd705724d7ad704c3228c859b3cffc05f60e Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Wed, 17 Sep 2025 14:50:06 -0500 Subject: [PATCH] Gui: Fix ignored font preference --- src/Gui/ReportView.cpp | 11 +++++++++-- src/Gui/TextEdit.cpp | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/Gui/ReportView.cpp b/src/Gui/ReportView.cpp index e8dd976f60..d158ec4e46 100644 --- a/src/Gui/ReportView.cpp +++ b/src/Gui/ReportView.cpp @@ -853,8 +853,15 @@ void ReportOutput::OnChange(Base::Subject &rCaller, const char * sR } else if (strcmp(sReason, "FontSize") == 0 || strcmp(sReason, "Font") == 0) { int fontSize = rclGrp.GetInt("FontSize", 10); - QFont font = QFontDatabase::systemFont(QFontDatabase::FixedFont); - font.setPointSize(fontSize); + QFont font; + auto fontName = rclGrp.GetASCII("Font"); + if (fontName.empty()) { + font = QFontDatabase::systemFont(QFontDatabase::FixedFont); + font.setPointSize(fontSize); + } + else { + font = QFont (QString::fromStdString(fontName), 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 4977e8ac48..49663b9b0f 100644 --- a/src/Gui/TextEdit.cpp +++ b/src/Gui/TextEdit.cpp @@ -448,8 +448,15 @@ void TextEditor::OnChange(Base::Subject &rCaller,const char* sReaso #else int fontSize = hPrefGrp->GetInt("FontSize", 10); #endif - QFont font = QFontDatabase::systemFont(QFontDatabase::FixedFont); - font.setPointSize(fontSize); + QFont font; + auto fontName = hPrefGrp->GetASCII("Font"); + if (fontName.empty()) { + font = QFontDatabase::systemFont(QFontDatabase::FixedFont); + font.setPointSize(fontSize); + } + else { + font = QFont (QString::fromStdString(fontName), fontSize); + } setFont(font); lineNumberArea->setFont(font); }