From a7965b9770925eb01a0c3113c8b172f756b5457f Mon Sep 17 00:00:00 2001
From: Evgeny Zakrevsky <evgeny.zakrevsky@jetbrains.com>
Date: Wed, 11 Apr 2012 20:41:59 +0400
Subject: [PATCH] IDEA-83957 No scrollbars in Settings->Version Control

---
 .../VcsDirectoryConfigurationPanel.java       | 53 ++++++++-----------
 .../configurable/VcsManagerConfigurable.java  |  2 +-
 2 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java
index c8b4d9e78e9a..b30e1467d767 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java
@@ -360,36 +360,25 @@ public class VcsDirectoryConfigurationPanel extends PanelWithButtons implements
           removeMapping();
           updateRootCheckers();
         }
+      }).setAddActionUpdater(new AnActionButtonUpdater() {
+        @Override
+        public boolean isEnabled(AnActionEvent e) {
+          return !myIsDisabled;
+        }
+      }).setEditActionUpdater(new AnActionButtonUpdater() {
+        @Override
+        public boolean isEnabled(AnActionEvent e) {
+          final boolean hasSelection = myDirectoryMappingTable.getSelectedObject() != null;
+          return (!myIsDisabled) && hasSelection;
+        }
+      }).setRemoveActionUpdater(new AnActionButtonUpdater() {
+        @Override
+        public boolean isEnabled(AnActionEvent e) {
+          final boolean hasSelection = myDirectoryMappingTable.getSelectedObject() != null;
+          return (!myIsDisabled) && hasSelection;
+        }
       }).disableUpDownActions().createPanel();
-
-    AnActionButton addButton = ToolbarDecorator.findAddButton(panelForTable);
-    assert addButton != null;
-    addButton.addCustomUpdater(new AnActionButtonUpdater() {
-      @Override
-      public boolean isEnabled(AnActionEvent e) {
-        return !myIsDisabled;
-      }
-    });
-
-    AnActionButton editButton = ToolbarDecorator.findEditButton(panelForTable);
-    assert editButton != null;
-    editButton.addCustomUpdater(new AnActionButtonUpdater() {
-      @Override
-      public boolean isEnabled(AnActionEvent e) {
-        final boolean hasSelection = myDirectoryMappingTable.getSelectedObject() != null;
-        return (!myIsDisabled) && hasSelection;
-      }
-    });
-
-    AnActionButton removeButton = ToolbarDecorator.findRemoveButton(panelForTable);
-    assert removeButton != null;
-    removeButton.addCustomUpdater(new AnActionButtonUpdater() {
-      @Override
-      public boolean isEnabled(AnActionEvent e) {
-        final boolean hasSelection = myDirectoryMappingTable.getSelectedObject() != null;
-        return (!myIsDisabled) && hasSelection;
-      }
-    });
+    panelForTable.setPreferredSize(new Dimension(-1, 200));
     return panelForTable;
   }
 
@@ -523,8 +512,9 @@ public class VcsDirectoryConfigurationPanel extends PanelWithButtons implements
     VcsRootErrorLabel(String title) {
       super(new BorderLayout(DEFAULT_HGAP, DEFAULT_VGAP));
 
-      CompoundBorder outsideBorder = BorderFactory.createCompoundBorder(BorderFactory.createMatteBorder(5, 0, 5, 0, UIUtil.getPanelBackground()),
-                                                                 BorderFactory.createLineBorder(UIUtil.getPanelBackground().darker()));
+      CompoundBorder outsideBorder =
+        BorderFactory.createCompoundBorder(BorderFactory.createMatteBorder(5, 0, 5, 0, UIUtil.getPanelBackground()),
+                                           BorderFactory.createLineBorder(UIUtil.getPanelBackground().darker()));
       setBorder(BorderFactory.createCompoundBorder(outsideBorder, BorderFactory.createEmptyBorder(DEFAULT_VGAP, DEFAULT_HGAP,
                                                                                                   DEFAULT_VGAP, DEFAULT_HGAP)));
       setOpaque(true);
@@ -553,5 +543,4 @@ public class VcsDirectoryConfigurationPanel extends PanelWithButtons implements
       }, null);
     }
   }
-
 }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java
index 71613ab35ee3..86dc3940cd42 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java
@@ -36,7 +36,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstract implements Configurable.NoScroll {
+public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstract {
   public static final Icon ICON = IconLoader.getIcon("/general/configurableVcs.png");
   private final Project myProject;
   private VcsDirectoryConfigurationPanel myMappings;