* experiment with high-dpi icons

This commit is contained in:
Reinhard Pointner 2015-11-20 14:04:49 +00:00
parent e08ecc064a
commit 0c9004a866
1 changed files with 9 additions and 10 deletions

View File

@ -37,12 +37,8 @@ public final class ResourceManager {
return null; return null;
} }
if (Settings.isMacApp()) { Image image = getImage(resource);
// load sun.awt.image.ToolkitImage or sun.awt.image.MultiResolutionToolkitImage (via @2x convention) icon = new ImageIcon(image);
icon = new ImageIcon(Toolkit.getDefaultToolkit().getImage(resource));
} else {
icon = new ImageIcon(resource);
}
// update cache // update cache
synchronized (cache) { synchronized (cache) {
@ -53,9 +49,7 @@ public final class ResourceManager {
} }
public static List<Image> getApplicationIcons() { public static List<Image> getApplicationIcons() {
return getApplicationIconURLs().stream().map(it -> { return getApplicationIconURLs().stream().map(ResourceManager::getImage).collect(Collectors.toList());
return Toolkit.getDefaultToolkit().getImage(it);
}).collect(Collectors.toList());
} }
public static List<URL> getApplicationIconURLs() { public static List<URL> getApplicationIconURLs() {
@ -67,7 +61,12 @@ public final class ResourceManager {
} }
public static Icon getFlagIcon(String languageCode) { 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);
} }
/** /**