Fix font

Author: SineStriker

README.md

@@ -1,6 +1,6 @@
 # DiffScope
 
-DiffSinger Editor developed by OpenVPI.
+Cross-platform SVS editor powered by DiffSinger.
 
 ## Supported Platforms
 

libs/qtmediate

@@ -1,7 +1,8 @@
-#include <QApplication>
-#include <QDebug>
-#include <QProcess>
-#include <QNetworkProxyFactory>
+#include <QtCore/QDebug>
+#include <QtCore/QProcess>
+#include <QtNetwork/QNetworkProxyFactory>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QToolTip>
 
 #include <extensionsystem/pluginmanager.h>
 
@@ -73,29 +74,48 @@ class MyLoaderConfiguration : public Loader::LoaderConfiguration {
             }
 
             value = settings->value(QStringLiteral("Font"));
-            if (!value.isNull()) {
-                QFont font;
-                if (font.fromString(value.toString())) {
-                    QGuiApplication::setFont(font);
+            {
+                // Default font
+                QFont font(QMAppExtension::systemDefaultFont());
+                font.setPixelSize(12);
+
+                // Get font
+                if (!value.isNull()) {
+                    font.fromString(value.toString());
                 }
+
+                // Normalize font
                 if (font.pixelSize() <= 0) {
                     font.setPixelSize(12);
                 }
                 qIDec->setFontRatio(font.pixelSize() / 12.0);
+
+                // The application font is determined at startup and remains unchanged, using the
+                // `userFont` property to record the changes made by the user during the current
+                // application life.
+                qApp->setProperty("userFont", font);
+                qApp->setProperty("userFontInitial", font);
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+                font.setPointSize(font.pixelSize() * 0.75 * qIDec->zoomRatio());
+#else
+                font.setPixelSize(font.pixelSize() * qIDec->zoomRatio());
+#endif
+                // Make the default font update with system dpi
+                QGuiApplication::setFont(font);
+                QToolTip::setFont(font);
             }
-            // The application font is determined at startup and remains unchanged, using the
-            // `userFont` property to record the changes made by the user during the current
-            // application life.
-            qApp->setProperty("userFont", QGuiApplication::font());
 
             value = settings->value(QStringLiteral("UseSystemFont"));
-            if (value.type() == QVariant::String) {
-                qApp->setProperty("useSystemFont",
-                                  value.toString().toLower() == QStringLiteral("true"));
-            } else {
+            {
+                // Default value
                 qApp->setProperty("useSystemFont", true);
+                // Get value
+                if (value.type() == QVariant::String) {
+                    qApp->setProperty("useSystemFont",
+                                      value.toString().toLower() == QStringLiteral("true"));
+                }
             }
-
             settings->endGroup();
         }
 

src/app/main.cpp

@@ -90,7 +90,7 @@ namespace Core {
             QApplication::translate(
                 "Application",
                 "<h3>About Application</h3>"
-                "<p>%1 is a cross-platform SVS editing application mainly powered by "
+                "<p>%1 is a cross-platform SVS editing application powered by "
                 "DiffSinger for virtual singer producers to make song compositions.</p>")
                 .arg(appName);
 

src/plugins/coreplugin/core/appextra.cpp

@@ -16,6 +16,7 @@
 #include <QGroupBox>
 #include <QListView>
 #include <QCheckBox>
+#include <QToolTip>
 
 #include <extensionsystem/pluginmanager.h>
 
@@ -52,6 +53,24 @@ namespace Core::Internal {
         50, 75, 100, 125, 150, 175, 200, 225, 250,
     };
 
+    static inline QFont systemFont() {
+        auto font = qAppExt->systemDefaultFont();
+        font.setPixelSize(12);
+        return font;
+    }
+
+    static inline void syncAppFontSize() {
+        auto font = qApp->property("userFontInitial").value<QFont>();
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+        font.setPointSize(font.pixelSize() * 0.75 * qIDec->zoomRatio());
+#else
+        font.setPixelSize(font.pixelSize() * qIDec->zoomRatio());
+#endif
+        // Make the default font update with system dpi
+        QGuiApplication::setFont(font);
+        QToolTip::setFont(font);
+    }
+
     class AppearancePageWidget : public QWidget {
     public:
         explicit AppearancePageWidget(QWidget *parent = nullptr) : QWidget(parent) {
@@ -135,12 +154,6 @@ namespace Core::Internal {
         QFont originalFont;
         bool originalUseSystemFont;
 
-        static QFont systemFont() {
-            auto font = qAppExt->systemDefaultFont();
-            font.setPixelSize(12);
-            return font;
-        }
-
     private:
         void _q_useSystemFontButtonToggled(bool checked) {
             if (checked) {
@@ -160,6 +173,7 @@ namespace Core::Internal {
         void _q_zoomComboBoxIndexChanged(int index) {
             Q_UNUSED(this)
             qIDec->setZoomRatio(double(zoomRatioList[index]) / 100);
+            syncAppFontSize();
         }
 
         void updateFontText() const {
@@ -253,6 +267,8 @@ namespace Core::Internal {
             qApp->setProperty("userFont", m_widget->originalFont);
             qApp->setProperty("useSystemFont", m_widget->originalUseSystemFont);
 
+            syncAppFontSize();
+
             // Save recorded arguments
             auto settings = ExtensionSystem::PluginManager::settings();
             settings->beginGroup("Preferences");