Merge pull request #7876 from Chocobo1/optionIcons

Fix gui issues on high DPI monitor

src/base/preferences.cpp

@@ -1216,9 +1216,9 @@ void Preferences::setMainLastDir(const QString &path)
     setValue("MainWindowLastDir", path);
 }
 
-QSize Preferences::getPrefSize(const QSize &defaultSize) const
+QSize Preferences::getPrefSize() const
 {
-    return value("Preferences/State/size", defaultSize).toSize();
+    return value("Preferences/State/size").toSize();
 }
 
 void Preferences::setPrefSize(const QSize &size)
@@ -1296,9 +1296,9 @@ void Preferences::setPropTrackerListState(const QByteArray &state)
     setValue("TorrentProperties/Trackers/qt5/TrackerListState", state);
 }
 
-QSize Preferences::getRssGeometrySize(const QSize &defaultSize) const
+QSize Preferences::getRssGeometrySize() const
 {
-    return value("RssFeedDownloader/geometrySize", defaultSize).toSize();
+    return value("RssFeedDownloader/geometrySize").toSize();
 }
 
 void Preferences::setRssGeometrySize(const QSize &geometry)

src/base/preferences.h

@@ -301,7 +301,7 @@ public:
     void setMainVSplitterState(const QByteArray &state);
     QString getMainLastDir() const;
     void setMainLastDir(const QString &path);
-    QSize getPrefSize(const QSize &defaultSize) const;
+    QSize getPrefSize() const;
     void setPrefSize(const QSize &size);
     QStringList getPrefHSplitterSizes() const;
     void setPrefHSplitterSizes(const QStringList &sizes);
@@ -317,7 +317,7 @@ public:
     void setPropVisible(const bool visible);
     QByteArray getPropTrackerListState() const;
     void setPropTrackerListState(const QByteArray &state);
-    QSize getRssGeometrySize(const QSize &defaultSize) const;
+    QSize getRssGeometrySize() const;
     void setRssGeometrySize(const QSize &geometry);
     QByteArray getRssHSplitterSizes() const;
     void setRssHSplitterSizes(const QByteArray &sizes);

src/base/utils/misc.cpp

@@ -632,19 +632,6 @@ void Utils::Misc::openFolderSelect(const QString &absolutePath)
 #endif
 }
 
-QSize Utils::Misc::smallIconSize()
-{
-    // Get DPI scaled icon size (device-dependent), see QT source
-    int s = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
-    return QSize(s, s);
-}
-
-QSize Utils::Misc::largeIconSize()
-{
-    // Get DPI scaled icon size (device-dependent), see QT source
-    int s = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize);
-    return QSize(s, s);
-}
 #endif // DISABLE_GUI
 
 QString Utils::Misc::osName()

src/base/utils/misc.h

@@ -103,8 +103,6 @@ namespace Utils
         void openFolderSelect(const QString& absolutePath);
 
         QPoint screenCenter(const QWidget *w);
-        QSize smallIconSize();
-        QSize largeIconSize();
 #endif
 
 #ifdef Q_OS_WIN