From 5c95d50407c8117266a590e8a3e2369d67eeb519 Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Thu, 15 Sep 2016 21:33:00 +0300
Subject: [PATCH] Registry: remove "ide.settings.old.style" property

---
 .../options/newEditor/SettingsEditor.java     | 66 ++++++-------------
 .../util/resources/misc/registry.properties   |  1 -
 2 files changed, 20 insertions(+), 47 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java
index 9b2a5c843ac4..46b03ed48625 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java
@@ -26,10 +26,8 @@ import com.intellij.openapi.options.ex.ConfigurableWrapper;
 import com.intellij.openapi.options.ex.Settings;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.LoadingDecorator;
-import com.intellij.openapi.ui.OnePixelDivider;
 import com.intellij.openapi.util.ActionCallback;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.ui.OnePixelSplitter;
@@ -191,50 +189,26 @@ final class SettingsEditor extends AbstractEditor implements DataProvider {
     myLoadingDecorator = new LoadingDecorator(myEditor, this, 10, true);
     myBanner = new Banner(myEditor.getResetAction());
     mySearchPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-    JComponent left = myTreeView;
-    JComponent right = myLoadingDecorator.getComponent();
-    if (Registry.is("ide.settings.old.style")) {
-      myBanner.setBorder(BorderFactory.createEmptyBorder(5, 10, 0, 10));
-      mySearch.setBackground(UIUtil.SIDE_PANEL_BACKGROUND);
-      mySearchPanel.setBackground(UIUtil.SIDE_PANEL_BACKGROUND);
-      mySearchPanel.addComponentListener(new ComponentAdapter() {
-        @Override
-        public void componentResized(ComponentEvent event) {
-          Dimension size = myBanner.getPreferredSize();
-          size.height = mySearchPanel.getHeight() - 5;
-          myBanner.setPreferredSize(size);
-          myBanner.setSize(size);
-          myBanner.revalidate();
-          myBanner.repaint();
-        }
-      });
-      left = new JPanel(new BorderLayout());
-      left.add(BorderLayout.NORTH, mySearchPanel);
-      left.add(BorderLayout.CENTER, myTreeView);
-
-      right = new JPanel(new BorderLayout());
-      right.add(BorderLayout.NORTH, myBanner);
-      right.add(BorderLayout.CENTER, myLoadingDecorator.getComponent());
-    }
-    else {
-      myBanner.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10));
-      myTreeView.addComponentListener(new ComponentAdapter() {
-        @Override
-        public void componentResized(ComponentEvent event) {
-          Dimension size = mySearchPanel.getPreferredSize();
-          size.width = myTreeView.getWidth();
-          mySearchPanel.setPreferredSize(size);
-          mySearchPanel.setSize(size);
-          mySearchPanel.revalidate();
-          mySearchPanel.repaint();
-        }
-      });
-      JPanel panel = new JPanel(new BorderLayout());
-      panel.add(BorderLayout.WEST, mySearchPanel);
-      panel.add(BorderLayout.CENTER, myBanner);
-      panel.setBorder(JBUI.Borders.customLine(OnePixelDivider.BACKGROUND, 0, 0, 1, 0));
-      add(BorderLayout.NORTH, panel);
-    }
+    myBanner.setBorder(BorderFactory.createEmptyBorder(5, 10, 0, 10));
+    mySearch.setBackground(UIUtil.SIDE_PANEL_BACKGROUND);
+    mySearchPanel.setBackground(UIUtil.SIDE_PANEL_BACKGROUND);
+    mySearchPanel.addComponentListener(new ComponentAdapter() {
+      @Override
+      public void componentResized(ComponentEvent event) {
+        Dimension size = myBanner.getPreferredSize();
+        size.height = mySearchPanel.getHeight() - 5;
+        myBanner.setPreferredSize(size);
+        myBanner.setSize(size);
+        myBanner.revalidate();
+        myBanner.repaint();
+      }
+    });
+    JComponent left = new JPanel(new BorderLayout());
+    left.add(BorderLayout.NORTH, mySearchPanel);
+    left.add(BorderLayout.CENTER, myTreeView);
+    JComponent right = new JPanel(new BorderLayout());
+    right.add(BorderLayout.NORTH, myBanner);
+    right.add(BorderLayout.CENTER, myLoadingDecorator.getComponent());
     mySplitter = new OnePixelSplitter(false, myProperties.getFloat(SPLITTER_PROPORTION, .2f));
     mySplitter.setHonorComponentsMinimumSize(true);
     mySplitter.setFirstComponent(left);
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index da2f1ee06646..2e2fde5a3546 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -598,7 +598,6 @@ ide.settings.configurable.loading.threshold=0
 ide.settings.configurable.loading.threshold.description=A positive number of milliseconds starts debugging of Settings loading.
 
 ide.settings.replace.group.with.single.configurable=true
-ide.settings.old.style=true
 
 commonjs.complete.required.filename.with.extension=false
 commonjs.complete.required.filename.with.extension.description=If checked, required filenames are completed with extension