From 0c9004a86664797f21d7038a3ab1e1e59662e574 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Fri, 20 Nov 2015 14:04:49 +0000 Subject: [PATCH] * experiment with high-dpi icons --- source/net/filebot/ResourceManager.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/source/net/filebot/ResourceManager.java b/source/net/filebot/ResourceManager.java index 8e5ed772..e4d442ce 100644 --- a/source/net/filebot/ResourceManager.java +++ b/source/net/filebot/ResourceManager.java @@ -37,12 +37,8 @@ public final class ResourceManager { return null; } - if (Settings.isMacApp()) { - // load sun.awt.image.ToolkitImage or sun.awt.image.MultiResolutionToolkitImage (via @2x convention) - icon = new ImageIcon(Toolkit.getDefaultToolkit().getImage(resource)); - } else { - icon = new ImageIcon(resource); - } + Image image = getImage(resource); + icon = new ImageIcon(image); // update cache synchronized (cache) { @@ -53,9 +49,7 @@ public final class ResourceManager { } public static List getApplicationIcons() { - return getApplicationIconURLs().stream().map(it -> { - return Toolkit.getDefaultToolkit().getImage(it); - }).collect(Collectors.toList()); + return getApplicationIconURLs().stream().map(ResourceManager::getImage).collect(Collectors.toList()); } public static List getApplicationIconURLs() { @@ -67,7 +61,12 @@ public final class ResourceManager { } public static Icon getFlagIcon(String languageCode) { - return getIcon(String.format("flags/%s", languageCode)); + return getIcon("flags/" + languageCode); + } + + private static Image getImage(URL resource) { + // load sun.awt.image.ToolkitImage or sun.awt.image.MultiResolutionToolkitImage (via @2x convention) + return Toolkit.getDefaultToolkit().getImage(resource); } /**