From ce6f999e0dbad8b87ba0cd65df323f8c387cba6e Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Tue, 28 Jan 2020 22:54:52 +0300
Subject: [PATCH] IDEA-231353: Fix insets in the Settings dialog

GitOrigin-RevId: 1a7d2e509ad5a49106bc4f9d9ff62a6692821651
---
 .../intellij/openapi/options/ex/ConfigurableCardPanel.java    | 2 +-
 .../openapi/options/newEditor/ConfigurableEditor.java         | 2 +-
 .../intellij/openapi/options/newEditor/SettingsEditor.java    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableCardPanel.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableCardPanel.java
index bc3769cd365e..cd9668365e99 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableCardPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableCardPanel.java
@@ -124,7 +124,7 @@ public class ConfigurableCardPanel extends CardLayoutPanel<Configurable, Configu
               panel.add(BorderLayout.CENTER, component);
               component = panel;
             }
-            component.setBorder(JBUI.Borders.empty(5, 10, 10, 10));
+            component.setBorder(JBUI.Borders.empty(5, 16, 16, 16));
           }
           if (ConfigurableWrapper.cast(Configurable.NoScroll.class, configurable) == null) {
             JScrollPane scroll = ScrollPaneFactory.createScrollPane(null, true);
diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/ConfigurableEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/ConfigurableEditor.java
index f0c9e0efaca5..0e8abbd60423 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/ConfigurableEditor.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/ConfigurableEditor.java
@@ -282,7 +282,7 @@ class ConfigurableEditor extends AbstractEditor implements AnActionListener, AWT
 
   private JComponent createDefaultContent(Configurable configurable) {
     JComponent content = new JPanel(new BorderLayout());
-    content.setBorder(JBUI.Borders.empty(10));
+    content.setBorder(JBUI.Borders.empty(5, 16, 16, 16));
     String key = configurable == null ? null : ConfigurableVisitor.getId(configurable) + ".settings.description";
     String description = key == null ? null : getString(configurable, key);
     if (description == null) {
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 316eab3614a1..871711d6a09b 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
@@ -209,8 +209,8 @@ final class SettingsEditor extends AbstractEditor implements DataProvider {
     myEditor.setPreferredSize(JBUI.size(800, 600));
     myLoadingDecorator = new LoadingDecorator(myEditor, this, 10, true);
     myBanner = new Banner(myEditor.getResetAction());
-    searchPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-    myBanner.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 10));
+    searchPanel.setBorder(JBUI.Borders.empty(7, 5, 6, 5));
+    myBanner.setBorder(JBUI.Borders.empty(5, 3, 0, 10)); // because banner sets doubled left value
     mySearch.setBackground(UIUtil.SIDE_PANEL_BACKGROUND);
     searchPanel.setBackground(UIUtil.SIDE_PANEL_BACKGROUND);
     JComponent left = new JPanel(new BorderLayout());