Adapt iface methods to newer internal API

qgis · May 17, 2023 · c27d184 · c27d184
1 parent 8793506
commit c27d184
Showing 1 changed file with 37 additions and 2 deletions.
diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp
@@ -465,16 +465,51 @@ void QgisAppInterface::showProjectPropertiesDialog( const QString &currentPage )
 
 QMap<QString, QVariant> QgisAppInterface::defaultStyleSheetOptions()
 {
-  return qgis->styleSheetBuilder()->defaultOptions();
+  QMap<QString, QVariant> res = qgis->styleSheetBuilder()->defaultOptions();
+
+  // for compatibility with older code, re-add the fontPointSize and fontFamily values which are
+  // no longer handled by the styleSheetBuilder method.
+  res.insert( QStringLiteral( "fontPointSize" ), qgis->styleSheetBuilder()->fontSize() );
+  res.insert( QStringLiteral( "fontFamily" ), qgis->styleSheetBuilder()->fontFamily() );
+
+  return res;
 }
 
 void QgisAppInterface::buildStyleSheet( const QMap<QString, QVariant> &opts )
 {
-  qgis->styleSheetBuilder()->buildStyleSheet( opts );
+  // remove unwanted fontPointSize / fontFamily keys, which may be present from older code
+  QMap< QString, QVariant> newOpts = opts;
+  if ( newOpts.contains( QStringLiteral( "fontPointSize" ) ) && (
+         newOpts.value( QStringLiteral( "fontPointSize" ) ).toDouble() == qgis->styleSheetBuilder()->defaultFont().pointSizeF()
+         || newOpts.value( QStringLiteral( "fontPointSize" ) ).toString() == QString::number( qgis->styleSheetBuilder()->defaultFont().pointSizeF() ) ) )
+  {
+    newOpts.remove( QStringLiteral( "fontPointSize" ) );
+  }
+  if ( newOpts.contains( QStringLiteral( "fontFamily" ) ) &&
+       newOpts.value( QStringLiteral( "fontFamily" ) ).toString() == qgis->styleSheetBuilder()->defaultFont().family() )
+  {
+    newOpts.remove( QStringLiteral( "fontFamily" ) );
+  }
+
+  qgis->styleSheetBuilder()->buildStyleSheet( newOpts );
 }
 
 void QgisAppInterface::saveStyleSheetOptions( const QMap<QString, QVariant> &opts )
 {
+  // remove unwanted fontPointSize / fontFamily keys, which may be present from older code
+  QMap< QString, QVariant> newOpts = opts;
+  if ( newOpts.contains( QStringLiteral( "fontPointSize" ) ) && (
+         newOpts.value( QStringLiteral( "fontPointSize" ) ).toDouble() == qgis->styleSheetBuilder()->defaultFont().pointSizeF()
+         || newOpts.value( QStringLiteral( "fontPointSize" ) ).toString() == QString::number( qgis->styleSheetBuilder()->defaultFont().pointSizeF() ) ) )
+  {
+    newOpts.remove( QStringLiteral( "fontPointSize" ) );
+  }
+  if ( newOpts.contains( QStringLiteral( "fontFamily" ) ) &&
+       newOpts.value( QStringLiteral( "fontFamily" ) ).toString() == qgis->styleSheetBuilder()->defaultFont().family() )
+  {
+    newOpts.remove( QStringLiteral( "fontFamily" ) );
+  }
+
   qgis->styleSheetBuilder()->saveToSettings( opts );
 }