From 3e4eabfe4d9beb8defbdc6277bd564a7ab87ecd3 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Wed, 23 Dec 2015 18:17:58 +0300
Subject: [PATCH] Revert "IDEA-149324 use default scrollbar policy"

It fixes minor issue, while introducing more distractfull one (horizontal scrollbar should not be visible in most cases)

This reverts commit 1b0a1014d7740fd10eadf014dfbc5a92fff9d467.
---
 .../intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java | 2 ++
 1 file changed, 2 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 5546304c1d5b..9d82f7c97f88 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
@@ -1012,6 +1012,8 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
     JPanel mainPanel;
     if (myAdditionalOptionsPanel != null) {
       JScrollPane optionsPane = ScrollPaneFactory.createScrollPane(myAdditionalOptionsPanel, true);
+      optionsPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+      optionsPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
       optionsPane.getVerticalScrollBar().setUI(ButtonlessScrollBarUI.createTransparent());
       JPanel infoPanel = JBUI.Panels.simplePanel(optionsPane).withBorder(JBUI.Borders.emptyLeft(10));