From 1adcddbf0a84d8cef7af55b41e3849d2bf93b218 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Thu, 10 Sep 2015 17:30:45 +0300
Subject: [PATCH] vcs: commit dialog - do not cut options panel when vertical
 scrollbar is visible

---
 .../openapi/vcs/changes/ui/CommitChangeListDialog.java         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
index 39048e97f089..6318ca7551c7 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
@@ -54,6 +54,7 @@ import com.intellij.util.Alarm;
 import com.intellij.util.Consumer;
 import com.intellij.util.OnOffListener;
 import com.intellij.util.containers.ContainerUtilRt;
+import com.intellij.util.ui.ButtonlessScrollBarUI;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -1019,6 +1020,8 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
     JPanel infoPanel = new JPanel(new BorderLayout());
     JScrollPane optionsPane = ScrollPaneFactory.createScrollPane(myAdditionalOptionsPanel, true);
     optionsPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+    optionsPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
+    optionsPane.getVerticalScrollBar().setUI(ButtonlessScrollBarUI.createTransparent());
     infoPanel.add(optionsPane, BorderLayout.CENTER);
     rootPane.add(infoPanel, BorderLayout.EAST);
     infoPanel.setBorder(IdeBorderFactory.createEmptyBorder(0, 10, 0, 0));