From 2809db80706cd2fdff3106b313ff56f3ea7c280f Mon Sep 17 00:00:00 2001 From: Alexander Lobas Date: Wed, 5 Dec 2018 20:31:30 +0300 Subject: [PATCH] Fix search field offsets for search icon, cursor and empty text. --- .../ui/components/fields/ExtendableTextComponent.java | 2 +- .../ide/plugins/PluginManagerConfigurableNew.java | 4 ++-- .../ide/plugins/newui/PluginsGroupComponent.java | 2 +- .../ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java | 10 ++++------ 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ui/components/fields/ExtendableTextComponent.java b/platform/platform-api/src/com/intellij/ui/components/fields/ExtendableTextComponent.java index 1ba39506f724..4fbdf7790d43 100644 --- a/platform/platform-api/src/com/intellij/ui/components/fields/ExtendableTextComponent.java +++ b/platform/platform-api/src/com/intellij/ui/components/fields/ExtendableTextComponent.java @@ -33,7 +33,7 @@ public interface ExtendableTextComponent { return scale(5); } - default int getBeforeIconOffset() { + default int getAfterIconOffset() { return 0; } diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurableNew.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurableNew.java index de835f62d87f..a7c528eb3013 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurableNew.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurableNew.java @@ -213,10 +213,10 @@ public class PluginManagerConfigurableNew mySearchTextField.setBorder(JBUI.Borders.customLine(SEARCH_FIELD_BORDER_COLOR)); JBTextField editor = mySearchTextField.getTextEditor(); - editor.putClientProperty("JTextField.Search.Gap", JBUI.scale(-24)); + editor.putClientProperty("JTextField.Search.Gap", JBUI.scale(6)); editor.putClientProperty("JTextField.Search.GapEmptyText", JBUI.scale(-1)); editor.putClientProperty("StatusVisibleFunction", (BooleanFunction)field -> field.getText().isEmpty()); - editor.setBorder(JBUI.Borders.empty(0, 25)); + editor.setBorder(JBUI.Borders.empty(0, 6)); editor.setOpaque(true); editor.setBackground(SEARCH_BG_COLOR); } diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginsGroupComponent.java b/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginsGroupComponent.java index 596aa397bf29..7df17ff3dec3 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginsGroupComponent.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginsGroupComponent.java @@ -112,7 +112,7 @@ public class PluginsGroupComponent extends JBPanelWithEmptyText { myGroups.add(groupIndex == -1 ? myGroups.size() : groupIndex, uiGroup); OpaquePanel panel = new OpaquePanel(new BorderLayout(), SECTION_HEADER_BACKGROUND); - panel.setBorder(JBUI.Borders.empty(4, 13)); + panel.setBorder(JBUI.Borders.empty(4, 10)); JLabel title = new JLabel(group.title) { @Override diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java index 0e6950947056..1bd245804eff 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java @@ -128,14 +128,12 @@ public abstract class TextFieldWithPopupHandlerUI extends BasicTextFieldUI imple for (IconHolder holder : icons.values()) { int gap = holder.extension.getIconGap(); if (holder.extension.isIconBeforeText()) { - int offset = holder.extension.getBeforeIconOffset(); - bounds.x += offset; - bounds.width -= offset; + int offset = holder.extension.getAfterIconOffset(); holder.bounds.x = bounds.x; bounds.width -= holder.bounds.width + gap; - bounds.x += holder.bounds.width + gap; + bounds.x += holder.bounds.width + gap + offset; - margin.left += offset + holder.bounds.width + gap; + margin.left += holder.bounds.width + gap + offset; } else { bounds.width -= holder.bounds.width + gap; @@ -592,7 +590,7 @@ public abstract class TextFieldWithPopupHandlerUI extends BasicTextFieldUI imple } @Override - public int getBeforeIconOffset() { + public int getAfterIconOffset() { Integer gap = (Integer)getComponent().getClientProperty("JTextField.Search.Gap"); return gap == null ? 0 : gap; }