MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-148739 [follow-up]

Browse Source 
Cache retina images in "scale" instead of re-using "realIcon" which might have unwanted effective scale.
This commit is contained in:
Anton Tarasov
2015-12-09 15:31:46 +03:00
parent fb9ee4c8da
commit d35ae61ed3
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/openapi/util/IconLoader.java
+16 -10
View File
@@ -361,7 +361,9 @@ public final class IconLoader {
private boolean dark;
private float scale;
private ImageFilter filter;
private HashMap<Float, Icon> scaledIcons;
private Image retinaImageCache;
private HashMap<Float, Icon> scaledIconsCache;
private static final int SCALED_ICONS_CACHE_LIMIT = 5;
public CachedImageIcon(@NotNull URL url) {
@@ -431,8 +433,8 @@ public final class IconLoader {
if (scaleFactor == 1f) {
return this;
}
if (scaledIcons == null) {
scaledIcons = new LinkedHashMap<Float, Icon>(1) {
if (scaledIconsCache == null) {
scaledIconsCache = new LinkedHashMap<Float, Icon>(1) {
@Override
public boolean removeEldestEntry(Map.Entry<Float, Icon> entry) {
return size() > SCALED_ICONS_CACHE_LIMIT;
@@ -440,23 +442,27 @@ public final class IconLoader {
};
}
// TODO: consider clearing the cache on SCALE change
Icon result = scaledIcons.get(scaleFactor * SCALE);
float effectiveScale = scaleFactor * JBUI.scale(1f);
Icon result = scaledIconsCache.get(effectiveScale);
if (result != null) {
return result;
}
Icon icon = getRealIcon();
Image image = icon instanceof ImageIcon ?
((ImageIcon)icon).getImage() :
ImageLoader.loadFromUrl(myUrl, UIUtil.isUnderDarcula(), (scaleFactor * SCALE) >= 1.5f || UIUtil.isRetina(), filter);
boolean needRetinaImage = effectiveScale >= 1.5f || UIUtil.isRetina();
Image image = needRetinaImage && retinaImageCache != null ?
retinaImageCache :
ImageLoader.loadFromUrl(myUrl, UIUtil.isUnderDarcula(), needRetinaImage, filter);
if (image != null) {
if (needRetinaImage && retinaImageCache == null) {
retinaImageCache = image;
}
int width = (int)(getIconWidth() * scaleFactor);
int height = (int)(getIconHeight() * scaleFactor);
final BufferedImage resizedImage = Scalr.resize(ImageUtil.toBufferedImage(image), Scalr.Method.ULTRA_QUALITY, width, height);
result = getIcon(resizedImage);
scaledIcons.put(scaleFactor * SCALE, result);
scaledIconsCache.put(effectiveScale, result);
return result;
}