MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix for alloy search field

Browse Source
This commit is contained in:
Sergey Malenkov
2014-09-23 17:15:58 +04:00
parent ff29583e90
commit 7722e30b25
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
-11
View File
@@ -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));
}
platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsSearch.java
+15
View File
@@ -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);