Gui: Fix #12199 missing font family Courier on MacOS
This commit is contained in:
committed by
Benjamin Nauck
parent
30ce2ef619
commit
0e50784104
@@ -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"));
|
||||
|
||||
Reference in New Issue
Block a user