From 99c13c1e3774ec29640ccc2ac0d811603d4c024c Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Tue, 1 Mar 2016 11:51:18 +0300
Subject: [PATCH] adjust borders in show overrides popup title panel

---
 .../com/intellij/ui/popup/AbstractPopup.java   | 18 ++++--------------
 .../util/src/com/intellij/ui/CaptionPanel.java |  6 ++++--
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
index 11a2dc2fd5e4..76959083f905 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
@@ -269,24 +269,14 @@ public class AbstractPopup implements JBPopup {
         myCaption.setButtonComponent(new InplaceButton(
           new IconButton("Open as Tool Window", 
                          AllIcons.General.AutohideOff, AllIcons.General.AutohideOff, AllIcons.General.AutohideOffInactive),
-          new ActionListener() {
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-              pinCallback.process(AbstractPopup.this);
-            }
-          }
-        ));
+          e -> pinCallback.process(this)
+        ), JBUI.Borders.empty(4));
       }
       else if (cancelButton != null) {
-        myCaption.setButtonComponent(new InplaceButton(cancelButton, new ActionListener() {
-          @Override
-          public void actionPerformed(final ActionEvent e) {
-            cancel();
-          }
-        }));
+        myCaption.setButtonComponent(new InplaceButton(cancelButton, e -> cancel()), JBUI.Borders.empty(4));
       }
       else if (commandButton != null) {
-        myCaption.setButtonComponent(commandButton);
+        myCaption.setButtonComponent(commandButton, null);
       }
     }
     else {
diff --git a/platform/util/src/com/intellij/ui/CaptionPanel.java b/platform/util/src/com/intellij/ui/CaptionPanel.java
index 9cbd9e879418..929e0b2de8a2 100644
--- a/platform/util/src/com/intellij/ui/CaptionPanel.java
+++ b/platform/util/src/com/intellij/ui/CaptionPanel.java
@@ -18,9 +18,10 @@ package com.intellij.ui;
 
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import javax.swing.border.EmptyBorder;
+import javax.swing.border.Border;
 import java.awt.*;
 import java.awt.event.MouseEvent;
 
@@ -106,11 +107,12 @@ public class CaptionPanel extends JPanel {
     repaint();
   }
 
-  public void setButtonComponent(@NotNull ActiveComponent component) {
+  public void setButtonComponent(@NotNull ActiveComponent component, @Nullable Border border) {
     if (myButtonComponent != null) {
       remove(myButtonComponent.getComponent());
     }
     JPanel panel = new JPanel(new BorderLayout());
+    panel.setBorder(border);
     panel.add(new JLabel(" "), BorderLayout.WEST);
     panel.add(component.getComponent(), BorderLayout.CENTER);
     panel.setOpaque(false);