From a430f80b82b617d7335481c42bb83db5b02af8b1 Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Thu, 19 May 2016 21:43:53 +0300 Subject: [PATCH] IDEA-156077 Empty space instead of CLion app icon when minimize Welcome screen --- .../platform-impl/src/com/intellij/ui/AppUIUtil.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java index b7875fa3fb32..2fe049360929 100644 --- a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java +++ b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java @@ -73,7 +73,7 @@ public class AppUIUtil { ApplicationInfoEx appInfo = ApplicationInfoImpl.getShadowInstance(); List images = ContainerUtil.newArrayListWithCapacity(3); - if (SystemInfo.isXWindow) { + if (SystemInfo.isUnix) {//MacOS is Unix too String bigIconUrl = appInfo.getBigIconUrl(); if (bigIconUrl != null) { images.add(com.intellij.util.ImageLoader.loadFromResource(bigIconUrl)); @@ -82,7 +82,12 @@ public class AppUIUtil { images.add(com.intellij.util.ImageLoader.loadFromResource(appInfo.getIconUrl())); images.add(com.intellij.util.ImageLoader.loadFromResource(appInfo.getSmallIconUrl())); - + for (int i = 0; i < images.size(); i++) { + Image image = images.get(i); + if (image instanceof JBHiDPIScaledImage) { + images.set(i, ((JBHiDPIScaledImage)image).getDelegate()); + } + } return images; }