From 9299549ed55f8bbf44e8bfd14fa748308e303aec Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Thu, 4 Oct 2018 11:09:07 +0300
Subject: [PATCH] ui: use svg application icon instead of 32x32 png image

So EAP builds will use the special icon as window icon (IDEA-192585). 'size32' attribute in ApplicationInfo.xml files is now deprecated.
---
 .../intellij/openapi/application/ex/ApplicationInfoEx.java    | 4 ++++
 platform/platform-impl/src/com/intellij/ui/AppUIUtil.java     | 2 +-
 platform/platform-resources/src/idea/ApplicationInfo.xsd      | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java b/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java
index d7bee7b5a23f..0ffcc1041d7f 100644
--- a/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java
+++ b/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java
@@ -41,6 +41,10 @@ public abstract class ApplicationInfoEx extends ApplicationInfo {
 
   public abstract String getAboutImageUrl();
 
+  /**
+   * @deprecated use {@link #getApplicationSvgIconUrl()} instead
+   */
+  @Deprecated
   public abstract String getIconUrl();
 
   public abstract String getSmallIconUrl();
diff --git a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
index e3dd820edaec..510e797523e6 100644
--- a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
+++ b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java
@@ -86,7 +86,7 @@ public class AppUIUtil {
       }
     }
 
-    images.add(ImageLoader.loadFromResource(appInfo.getIconUrl()));
+    images.add(loadApplicationIcon(window, 32, appInfo.getIconUrl()));
     images.add(ImageLoader.loadFromResource(appInfo.getSmallIconUrl()));
 
     for (int i = 0; i < images.size(); i++) {
diff --git a/platform/platform-resources/src/idea/ApplicationInfo.xsd b/platform/platform-resources/src/idea/ApplicationInfo.xsd
index 2e301930939a..b9bd50b632c8 100644
--- a/platform/platform-resources/src/idea/ApplicationInfo.xsd
+++ b/platform/platform-resources/src/idea/ApplicationInfo.xsd
@@ -297,7 +297,7 @@
     <xs:attribute type="xs:string" name="size32">
       <xs:annotation>
         <xs:documentation>
-          Path to a 32x32 png file with the product icon.
+          Path to a 32x32 png file with the product icon. <strong>Deprecated: use 'svg' attribute instead.</strong>
         </xs:documentation>
       </xs:annotation>
     </xs:attribute>