From fadebfae61c135592c226adc40c17b81b3c7690a Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Fri, 17 May 2019 18:10:31 +0700 Subject: [PATCH] Better upscale icons to @3x or @4x (if necessary) --- source/net/filebot/ResourceManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/net/filebot/ResourceManager.java b/source/net/filebot/ResourceManager.java index 08e622df..01a86d13 100644 --- a/source/net/filebot/ResourceManager.java +++ b/source/net/filebot/ResourceManager.java @@ -75,6 +75,8 @@ public final class ResourceManager { // Windows 10: use down-scaled @2x image for non-integer scale factors 1.25 / 1.5 / 1.75 if (PRIMARY_SCALE_FACTOR > 1 && PRIMARY_SCALE_FACTOR < 2 && image.size() > 1) { image.add(1, scale(PRIMARY_SCALE_FACTOR / 2, image.get(1))); + } else if (PRIMARY_SCALE_FACTOR > 2) { + image.add(scale(PRIMARY_SCALE_FACTOR / 2, image.get(1))); } return new BaseMultiResolutionImage(image.toArray(Image[]::new)); @@ -97,8 +99,10 @@ public final class ResourceManager { } // Windows 10: use down-scaled @2x image for non-integer scale factors 1.25 / 1.5 / 1.75 - if (PRIMARY_SCALE_FACTOR > 1 && PRIMARY_SCALE_FACTOR < 2 && image.size() > 1) { - image.add(1, scale(PRIMARY_SCALE_FACTOR / baseScale, image.get(1))); + if (PRIMARY_SCALE_FACTOR > 1 && PRIMARY_SCALE_FACTOR < baseScale) { + image.add(1, scale(PRIMARY_SCALE_FACTOR / baseScale, baseImage)); + } else if (PRIMARY_SCALE_FACTOR > baseScale) { + image.add(scale(PRIMARY_SCALE_FACTOR / baseScale, baseImage)); } return new BaseMultiResolutionImage(image.toArray(Image[]::new));