From 2df6ff0c4f494bdeba102cee02e925fd08b697dc Mon Sep 17 00:00:00 2001 From: Craig Drummond Date: Wed, 20 Jan 2016 20:41:16 +0000 Subject: [PATCH] Adjust icon sizes if not high-dpi --- support/monoicon.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/support/monoicon.cpp b/support/monoicon.cpp index 9cb4a11a7..07d421da8 100644 --- a/support/monoicon.cpp +++ b/support/monoicon.cpp @@ -97,16 +97,14 @@ public: int pixelSize=qRound(rect.height()*scale); if (FontAwesome::ex_one==fontAwesomeIcon) { font.setBold(true); - } - #ifdef Q_OS_WIN - else { - if (pixelSize>=12 && pixelSize<=16) { + } else if (!Utils::isHighDpi()) { + if (pixelSize>=12 && pixelSize<=16 && rect.height()>14) { pixelSize=14; - } else if (pixelSize>=24 && pixelSize<=32) { + } else if (pixelSize>=24 && pixelSize<=32 && rect.height()>28) { pixelSize=28; } } - #endif + font.setPixelSize(pixelSize); font.setStyleStrategy(QFont::PreferAntialias); font.setHintingPreference(QFont::PreferFullHinting);