Use Qt formal API for setting application font instead of stylesheet

This should hopefully help address some hi-dpi font scaling issues
qgis · May 17, 2023 · 39e6f75 · 39e6f75
1 parent 33ea58d
commit 39e6f75
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/app/qgisappstylesheet.cpp b/src/app/qgisappstylesheet.cpp
@@ -58,13 +58,14 @@ void QgisAppStyleSheet::applyStyleSheet( const QMap<QString, QVariant> &opts )
   {
     bool overriddenFontSize = false;
     double currentFontSize = fontSize();
+    const QFont appFont = QApplication::font();
     if ( opts.contains( QStringLiteral( "fontPointSize" ) ) )
     {
       const double fontSizeFromOpts = opts.value( QStringLiteral( "fontPointSize" ) ).toDouble();
       currentFontSize = fontSizeFromOpts;
     }
     QgsDebugMsgLevel( QStringLiteral( "fontPointSize: %1" ).arg( currentFontSize ), 2 );
-    if ( currentFontSize != defaultFont().pointSizeF() )
+    if ( currentFontSize != appFont.pointSizeF() )
     {
       overriddenFontSize = true;
     }
@@ -76,17 +77,20 @@ void QgisAppStyleSheet::applyStyleSheet( const QMap<QString, QVariant> &opts )
       currentFontFamily = opts.value( QStringLiteral( "fontFamily" ) ).toString();
     }
     QgsDebugMsgLevel( QStringLiteral( "fontFamily: %1" ).arg( currentFontFamily ), 2 );
-    if ( !currentFontFamily.isEmpty() && currentFontFamily != defaultFont().family() )
+    if ( !currentFontFamily.isEmpty() && currentFontFamily != appFont.family() )
     {
       overriddenFontFamily = true;
     }
 
-    if ( overriddenFontFamily && overriddenFontSize )
-      ss += QStringLiteral( "* { font: %1pt \"%2\"} " ).arg( currentFontSize ).arg( currentFontFamily );
-    else if ( overriddenFontFamily )
-      ss += QStringLiteral( "* { font-family: \"%1\"} " ).arg( currentFontFamily );
-    else if ( overriddenFontSize )
-      ss += QStringLiteral( "* { font-size: %1pt } " ).arg( currentFontSize );
+    if ( overriddenFontFamily || overriddenFontSize )
+    {
+      QFont font = QApplication::font();
+      if ( overriddenFontFamily )
+        font.setFamily( currentFontFamily );
+      if ( overriddenFontSize )
+        font.setPointSizeF( currentFontSize );
+      QApplication::setFont( font );
+    }
   }
 
   if ( mMacStyle )