From 0e901ad26d5f146ae10e218b4829fdf01258050a Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Thu, 29 Nov 2012 12:14:42 +0100 Subject: [PATCH] Platform: disabled icons fix --- .../util/src/com/intellij/openapi/util/IconLoader.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/platform/util/src/com/intellij/openapi/util/IconLoader.java b/platform/util/src/com/intellij/openapi/util/IconLoader.java index c743fb2e2855..ebc6af3e38a8 100644 --- a/platform/util/src/com/intellij/openapi/util/IconLoader.java +++ b/platform/util/src/com/intellij/openapi/util/IconLoader.java @@ -251,7 +251,7 @@ public final class IconLoader { } final int scale = UIUtil.isRetina() ? 2 : 1; @SuppressWarnings("UndesirableClassUsage") - final BufferedImage image = new BufferedImage(scale*icon.getIconWidth(), scale*icon.getIconHeight(), BufferedImage.TYPE_INT_ARGB); + BufferedImage image = new BufferedImage(scale*icon.getIconWidth(), scale*icon.getIconHeight(), BufferedImage.TYPE_INT_ARGB); final Graphics2D graphics = image.createGraphics(); graphics.setColor(UIUtil.TRANSPARENT_COLOR); @@ -260,7 +260,10 @@ public final class IconLoader { icon.paintIcon(LabelHolder.ourFakeComponent, graphics, 0, 0); graphics.dispose(); - final Image img = UIUtil.isRetina() ? RetinaImage.createFrom(createDisabled(image), 2, ImageLoader.ourComponent) : image; + + Image img = createDisabled(image); + if (UIUtil.isRetina()) img = RetinaImage.createFrom(image, 2, ImageLoader.ourComponent); + disabledIcon = new MyImageIcon(img); ourIcon2DisabledIcon.put(icon, disabledIcon); }