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

Gui: Fix #12199 missing font family Courier on MacOS

Browse Source
This commit is contained in:
Lee Matos
2025-07-12 16:14:25 -04:00
committed by Benjamin Nauck
parent 2da7c9ff17
commit fcd1b923b3
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Gui/Icons/VarSet.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

3
src/Gui/PythonConsole.cpp
View File

@@ -425,7 +425,8 @@ PythonConsole::PythonConsole(QWidget *parent)
setVisibleLineNumbers(false);
setEnabledHighlightCurrentLine(false);
QFont serifFont(QLatin1String("Courier"), 10, QFont::Normal);
QFont serifFont = QFontDatabase::systemFont(QFontDatabase::FixedFont);
serifFont.setPointSize(10);
setFont(serifFont);
// set colors and font from settings

7
src/Gui/ReportView.cpp
View File

@@ -464,7 +464,7 @@ ReportOutput::~ReportOutput()
void ReportOutput::restoreFont()
{
QFont serifFont(QLatin1String("Courier"), 10, QFont::Normal);
QFont serifFont = QFontDatabase::systemFont(QFontDatabase::FixedFont);
setFont(serifFont);
}
@@ -854,9 +854,8 @@ 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);
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"));

8
src/Gui/TextEdit.cpp
View File

@@ -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<const char*> &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);
}