From 14cef1787203ecd89b3d9e999af39b1b9eada30f Mon Sep 17 00:00:00 2001
From: Sergei Tachenov <sergei.tachenov@jetbrains.com>
Date: Thu, 28 Mar 2024 12:12:53 +0200
Subject: [PATCH] IDEA-317864 Use ScrollableContentBorder in the Build tool
 window

GitOrigin-RevId: 1f3b84192fc0f86aee2427dd4de7a17fbad107fe
---
 .../src/com/intellij/build/MultipleBuildsView.java  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/build/MultipleBuildsView.java b/platform/lang-impl/src/com/intellij/build/MultipleBuildsView.java
index c364ab258938..3b6433095d7f 100644
--- a/platform/lang-impl/src/com/intellij/build/MultipleBuildsView.java
+++ b/platform/lang-impl/src/com/intellij/build/MultipleBuildsView.java
@@ -18,9 +18,7 @@ import com.intellij.openapi.ui.OnePixelDivider;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.wm.ToolWindow;
-import com.intellij.ui.OnePixelSplitter;
-import com.intellij.ui.SimpleColoredComponent;
-import com.intellij.ui.SimpleTextAttributes;
+import com.intellij.ui.*;
 import com.intellij.ui.components.JBList;
 import com.intellij.ui.components.JBScrollPane;
 import com.intellij.ui.content.Content;
@@ -83,6 +81,9 @@ public final class MultipleBuildsView implements BuildProgressListener, Disposab
     isInitializeStarted = new AtomicBoolean();
     myPostponedRunnables = ContainerUtil.createConcurrentList();
     myThreeComponentsSplitter = new OnePixelSplitter(SPLITTER_PROPERTY, 0.25f);
+    if (ExperimentalUI.isNewUI()) {
+      ScrollableContentBorder.setup(myThreeComponentsSplitter, Side.LEFT);
+    }
     myBuildsList = new JBList<>();
     myBuildsList.setModel(new DefaultListModel<>());
     updateBuildsListRowHeight();
@@ -269,7 +270,11 @@ public final class MultipleBuildsView implements BuildProgressListener, Disposab
           myToolbarActions = new DefaultActionGroup();
           ActionToolbar tb = ActionManager.getInstance().createActionToolbar("BuildView", myToolbarActions, false);
           tb.setTargetComponent(consoleComponent);
-          tb.getComponent().setBorder(JBUI.Borders.merge(tb.getComponent().getBorder(), JBUI.Borders.customLine(OnePixelDivider.BACKGROUND, 0, 0, 0, 1), true));
+          if (!ExperimentalUI.isNewUI()) {
+            tb.getComponent().setBorder(
+              JBUI.Borders.merge(tb.getComponent().getBorder(), JBUI.Borders.customLine(OnePixelDivider.BACKGROUND, 0, 0, 0, 1), true)
+            );
+          }
           consoleComponent.add(tb.getComponent(), BorderLayout.WEST);
 
           myContent = new ContentImpl(consoleComponent, myViewManager.getViewName(), true) {