From f487eba3f47e009521c86e56f2be210b8c3aec89 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <ampivovarov@gmail.com>
Date: Thu, 10 Mar 2016 15:31:42 +0300
Subject: [PATCH] diff: add border to DiffViewer in color settings

---
 .../openapi/diff/impl/settings/DiffPreviewPanel.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java b/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java
index 2329b3ad1226..965d2af33ae3 100644
--- a/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java
+++ b/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java
@@ -41,13 +41,16 @@ import com.intellij.openapi.editor.ex.util.EditorUtil;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
+import com.intellij.ui.IdeBorderFactory;
 import com.intellij.util.EventDispatcher;
 import com.intellij.util.ObjectUtils;
 import com.intellij.util.containers.ContainerUtil;
+import com.intellij.util.ui.JBUI;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 
+import javax.swing.*;
 import java.awt.*;
 import java.util.List;
 
@@ -55,6 +58,7 @@ import java.util.List;
  * The panel from the Settings, that allows to see changes to diff/merge coloring scheme right away.
  */
 class DiffPreviewPanel implements PreviewPanel {
+  private final JPanel myPanel;
   private final SimpleThreesideDiffViewer myViewer;
 
   private final EventDispatcher<ColorAndFontSettingsListener> myDispatcher = EventDispatcher.create(ColorAndFontSettingsListener.class);
@@ -76,11 +80,13 @@ class DiffPreviewPanel implements PreviewPanel {
       editor.addEditorMouseListener(clickListener);
       editor.getCaretModel().addCaretListener(clickListener);
     }
+
+    myPanel = JBUI.Panels.simplePanel(myViewer.getComponent()).withBorder(IdeBorderFactory.createBorder());
   }
 
   @Override
   public Component getPanel() {
-    return myViewer.getComponent();
+    return myPanel;
   }
 
   @Override