From 61dd4a29b279d32f78209a9a00fe79be855137ff Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Mon, 29 Jul 2013 12:33:57 +0200 Subject: [PATCH] different insets for different search fields --- .../com/intellij/ide/ui/laf/darcula/ui/DarculaTextBorder.java | 4 +++- .../intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextBorder.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextBorder.java index 1b5067af8da8..12f0430a58db 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextBorder.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextBorder.java @@ -31,7 +31,9 @@ import java.awt.*; public class DarculaTextBorder implements Border, UIResource { @Override public Insets getBorderInsets(Component c) { - if (DarculaTextFieldUI.isSearchField(c)) { + if (DarculaTextFieldUI.isSearchFieldWithHistoryPopup(c)) { + return new InsetsUIResource(5, 7 + 16 + 3, 5, 7 + 16); + } else if (DarculaTextFieldUI.isSearchField(c)) { return new InsetsUIResource(5, 4 + 16 + 3, 5, 7 + 16); } else { return new InsetsUIResource(5, 7, 5, 7); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java index 93ae7470f391..f1e01d7762a8 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java @@ -194,4 +194,8 @@ public class DarculaTextFieldUI extends BasicTextFieldUI { public static boolean isSearchField(Component c) { return c instanceof JTextField && "search".equals(((JTextField)c).getClientProperty("JTextField.variant")); } + + public static boolean isSearchFieldWithHistoryPopup(Component c) { + return isSearchField(c) && ((JTextField)c).getClientProperty("JTextField.Search.FindPopup") instanceof JPopupMenu; + } }