From 7722e30b253848e3522fa3dfcfba88abb720d5e9 Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Tue, 23 Sep 2014 17:13:24 +0400
Subject: [PATCH] fix for alloy search field

---
 .../openapi/options/newEditor/OptionsEditor.java  | 11 -----------
 .../openapi/options/newEditor/SettingsSearch.java | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
index 3a8c6c9aa62f..62b32b39bad4 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
@@ -17,8 +17,6 @@ package com.intellij.openapi.options.newEditor;
 
 import com.intellij.AbstractBundle;
 import com.intellij.CommonBundle;
-import com.intellij.ide.ui.laf.darcula.ui.DarculaTextBorder;
-import com.intellij.ide.ui.laf.darcula.ui.DarculaTextFieldUI;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.internal.statistic.UsageTrigger;
 import com.intellij.internal.statistic.beans.ConvertUsagesUtil;
@@ -37,7 +35,6 @@ import com.intellij.openapi.ui.*;
 import com.intellij.openapi.util.ActionCallback;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.EdtRunnable;
-import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.ui.LightColors;
 import com.intellij.ui.OnePixelSplitter;
@@ -149,14 +146,6 @@ public class OptionsEditor extends JPanel implements DataProvider, Place.Navigat
       }
     };
     if (Registry.is("ide.new.settings.dialog")) {
-      final JTextField editor = mySearch.getTextEditor();
-      if (!SystemInfo.isMac) {
-        editor.putClientProperty("JTextField.variant", "search");
-        if (!(editor.getUI() instanceof DarculaTextFieldUI)) {
-          editor.setUI((DarculaTextFieldUI)DarculaTextFieldUI.createUI(editor));
-          editor.setBorder(new DarculaTextBorder());
-        }
-      }
       mySearch.setBackground(UIUtil.getSidePanelColor());
       mySearch.setBorder(new EmptyBorder(5, 10, 2, 10));
     }
diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsSearch.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsSearch.java
index d3b4fc4ed1cb..5c85da920b06 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsSearch.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsSearch.java
@@ -15,10 +15,15 @@
  */
 package com.intellij.openapi.options.newEditor;
 
+import com.intellij.ide.ui.laf.darcula.ui.DarculaTextBorder;
+import com.intellij.ide.ui.laf.darcula.ui.DarculaTextFieldUI;
+import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.util.registry.Registry;
 import com.intellij.ui.SearchTextField;
 
 import javax.swing.KeyStroke;
 import javax.swing.InputMap;
+import javax.swing.JTextField;
 import javax.swing.JTree;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
@@ -34,6 +39,16 @@ abstract class SettingsSearch extends SearchTextField implements KeyListener {
     super(false);
     addKeyListener(new KeyAdapter() {
     });
+    if (Registry.is("ide.new.settings.dialog")) {
+      if (!SystemInfo.isMac) {
+        JTextField editor = getTextEditor();
+        editor.putClientProperty("JTextField.variant", "search");
+        if (!(editor.getUI() instanceof DarculaTextFieldUI)) {
+          editor.setUI((DarculaTextFieldUI)DarculaTextFieldUI.createUI(editor));
+          editor.setBorder(new DarculaTextBorder());
+        }
+      }
+    }
   }
 
   abstract void onTextKeyEvent(KeyEvent event);