diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc index c8ef3a87dc7bbe361c057f65779552d9486a2909..fa0c72d122f3926e33d66d43a822c908c38c676a 100644 --- a/src/QGCApplication.cc +++ b/src/QGCApplication.cc @@ -566,9 +566,33 @@ void QGCApplication::_loadCurrentStyle(void) success = false; } } + + // Now that we have the styles loaded we need to dpi adjust the font point sizes + + QString dpiAdjustedStyles; + if (success) { + QTextStream styleStream(&styles, QIODevice::ReadOnly); + QRegularExpression regex("font-size:.+(\\d\\d)pt;"); + + while (!styleStream.atEnd()) { + QString adjustedLine; + QString line = styleStream.readLine(); + + QRegularExpressionMatch match = regex.match(line); + if (match.hasMatch()) { + //qDebug() << "found:" << line << match.captured(1); + adjustedLine = QString("font-size: %1pt;").arg(ScreenTools::dpiAdjustedPointSize_s(match.captured(1).toDouble())); + //qDebug() << "adjusted:" << adjustedLine; + } else { + adjustedLine = line; + } + + dpiAdjustedStyles += adjustedLine; + } + } - if (!styles.isEmpty()) { - setStyleSheet(styles); + if (!dpiAdjustedStyles.isEmpty()) { + setStyleSheet(dpiAdjustedStyles); } if (!success) { @@ -603,4 +627,4 @@ void QGCApplication::_reconnect(void) { qgcApp()->restoreOverrideCursor(); LinkManager::instance()->createConnectedLink(_reconnectLinkConfig); -} \ No newline at end of file +}