From c63e42009fb58e337eda32236705d6354794eb97 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Wed, 9 May 2018 16:30:23 +0200
Subject: [PATCH] remove ide.new.about registry key

---
 .../application/impl/ApplicationInfoImpl.java |  3 +--
 .../src/com/intellij/ui/Splash.java           | 21 +++++++------------
 .../util/resources/misc/registry.properties   |  2 --
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
index 5bc23ddc0e79..750e6fb3c87c 100644
--- a/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java
@@ -11,7 +11,6 @@ import com.intellij.openapi.util.BuildNumber;
 import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.SystemInfoRt;
-import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.JBColor;
 import com.intellij.util.ArrayUtil;
@@ -56,7 +55,7 @@ public class ApplicationInfoImpl extends ApplicationInfoEx {
   private int myProgressHeight = 2;
   private int myProgressX = 1;
   private int myProgressY = 350;
-  private int myLicenseOffsetY = Registry.is("ide.new.about") ? 85 : 30;
+  private int myLicenseOffsetY = 85;
   private String mySplashImageUrl;
   private String myAboutImageUrl;
   @SuppressWarnings("UseJBColor") private Color mySplashTextColor = new Color(0, 35, 135);  // idea blue
diff --git a/platform/platform-impl/src/com/intellij/ui/Splash.java b/platform/platform-impl/src/com/intellij/ui/Splash.java
index 732010581832..f97981933b51 100644
--- a/platform/platform-impl/src/com/intellij/ui/Splash.java
+++ b/platform/platform-impl/src/com/intellij/ui/Splash.java
@@ -128,10 +128,7 @@ public class Splash extends JDialog implements StartupProgress {
       mySplashIsVisible = true;
     }
 
-    int totalWidth = myImage.getIconWidth() - getProgressX();
-    if (Registry.is("ide.new.about")) {
-      totalWidth +=3;
-    }
+    int totalWidth = myImage.getIconWidth() - getProgressX() + 3;
     final int progressWidth = (int)(totalWidth * myProgress);
     final int width = progressWidth - myProgressLastPosition;
     g.setColor(color);
@@ -177,14 +174,12 @@ public class Splash extends JDialog implements StartupProgress {
         g.setFont(UIUtil.getFontWithFallback(font));
         g.setColor(textColor);
         int offsetX = uiScale(15);
-        int offsetY = 30;
-        if (Registry.is("ide.new.about")) {
-          if (info instanceof ApplicationInfoImpl) {
-            offsetX = Math.max(offsetX, uiScale(((ApplicationInfoImpl)info).getProgressX()));
-            offsetY = ((ApplicationInfoImpl)info).getLicenseOffsetY();
-          } else {
-            return false;
-          }
+        int offsetY;
+        if (info instanceof ApplicationInfoImpl) {
+          offsetX = Math.max(offsetX, uiScale(((ApplicationInfoImpl)info).getProgressX()));
+          offsetY = ((ApplicationInfoImpl)info).getLicenseOffsetY();
+        } else {
+          return false;
         }
 
         g.drawString(licensedToMessage, x + offsetX, y + height - uiScale(offsetY));
@@ -199,7 +194,7 @@ public class Splash extends JDialog implements StartupProgress {
 
   @NotNull
   protected static Font createFont(String name) {
-    return new Font(name, Font.PLAIN, uiScale(Registry.is("ide.new.about") ? 12 : SystemInfo.isUnix ? 10 : 11));
+    return new Font(name, Font.PLAIN, uiScale(12));
   }
 
   private static final float JBUI_INIT_SCALE = JBUI.scale(1f);
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index cd301f71b867..cec0c2a3b1ea 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -1303,8 +1303,6 @@ trace.focus.on.app.activation=false
 trace.focus.on.app.activation.description=Focus tracing on application activation and deactivation
 trace.focus.on.app.restartRequired=false
 
-ide.new.about=true
-
 tests.assert.clear.read.only.status.outside.write.action=false
 tests.assert.clear.read.only.status.outside.write.action.description=FileModificationService and similar calls should be outside write action