Fix some more tiny icons on hidpi displays

nyalldawson · nyalldawson · commit 956a74fcb7f2 · 2019-01-16T12:04:58.000+11:00
diff --git a/src/gui/symbology/qgsdashspacedialog.cpp b/src/gui/symbology/qgsdashspacedialog.cpp
@@ -17,25 +17,14 @@
 #include "qgsapplication.h"
 #include <QFile>
 
-QString iconPath( const QString &iconFile )
-{
-  // try active theme
-  QString path = QgsApplication::activeThemePath();
-  if ( QFile::exists( path + iconFile ) )
-    return path + iconFile;
-
-  // use default theme
-  return QgsApplication::defaultThemePath() + iconFile;
-}
-
 QgsDashSpaceDialog::QgsDashSpaceDialog( const QVector<qreal> &v, QWidget *parent, Qt::WindowFlags f ): QDialog( parent, f )
 {
   setupUi( this );
   connect( mAddButton, &QPushButton::clicked, this, &QgsDashSpaceDialog::mAddButton_clicked );
   connect( mRemoveButton, &QPushButton::clicked, this, &QgsDashSpaceDialog::mRemoveButton_clicked );
 
-  mAddButton->setIcon( QIcon( iconPath( "symbologyAdd.svg" ) ) );
-  mRemoveButton->setIcon( QIcon( iconPath( "symbologyRemove.svg" ) ) );
+  mAddButton->setIcon( QgsApplication::getThemeIcon( "symbologyAdd.svg" ) );
+  mRemoveButton->setIcon( QgsApplication::getThemeIcon( "symbologyRemove.svg" ) );
 
   double dash = 0;
   double space = 0;
diff --git a/src/gui/symbology/qgsrendererpropertiesdialog.cpp b/src/gui/symbology/qgsrendererpropertiesdialog.cpp
@@ -53,10 +53,7 @@ static bool _initRenderer( const QString &name, QgsRendererWidgetFunc f, const Q
 
   if ( !iconName.isEmpty() )
   {
-    QString iconPath = QgsApplication::defaultThemePath() + iconName;
-    QPixmap pix;
-    if ( pix.load( iconPath ) )
-      m->setIcon( pix );
+    m->setIcon( QgsApplication::getThemeIcon( iconName ) );
   }
 
   QgsDebugMsg( "Set for " + name );

Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,7 @@ static bool _initRenderer( const QString &name, QgsRendererWidgetFunc f, const Q`
`53`	`53`
`54`	`54`	`if ( !iconName.isEmpty() )`
`55`	`55`	`{`
`56`		`- QString iconPath = QgsApplication::defaultThemePath() + iconName;`
`57`		`- QPixmap pix;`
`58`		`- if ( pix.load( iconPath ) )`
`59`		`- m->setIcon( pix );`
	`56`	`+ m->setIcon( QgsApplication::getThemeIcon( iconName ) );`
`60`	`57`	`}`
`61`	`58`
`62`	`59`	`QgsDebugMsg( "Set for " + name );`