kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #24016 from chennes/fixIgnoredFontPreference

Browse Source 
Gui: Fix ignored font preference
This commit is contained in:
sliptonic
2025-10-06 10:35:51 -05:00
committed by GitHub
parent 1c816da43b a63cbd7057
commit bc696ad89b
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Gui/ReportView.cpp
View File

@@ -853,8 +853,15 @@ void ReportOutput::OnChange(Base::Subject<const char*> &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"));

11
src/Gui/TextEdit.cpp
View File

@@ -448,8 +448,15 @@ void TextEditor::OnChange(Base::Subject<const char*> &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);
}