From 3e5e7d8a3eec63d063dbb43a089ab6af9253095c Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Mon, 11 Apr 2016 20:39:55 +0300
Subject: [PATCH] add additional space for possible scroll bar

---
 .../src/com/intellij/ui/popup/list/ListPopupImpl.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java b/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java
index f1b05106ac98..bcc4de4428be 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java
@@ -32,6 +32,7 @@ import com.intellij.ui.SeparatorWithText;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.ui.popup.ClosableByLeftArrow;
 import com.intellij.ui.popup.WizardPopup;
+import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -525,13 +526,16 @@ public class ListPopupImpl extends WizardPopup implements ListPopup {
 
     @Override
     public Dimension getPreferredScrollableViewportSize() {
+      Dimension result = super.getPreferredScrollableViewportSize();
+      result.width += JBUI.scale(14); // support possible scroll bar
       int rowCount = getVisibleRowCount();
       int size = getModel().getSize();
       if (rowCount < size) {
         // Note: labeled separators are not counted in this branch
-        return super.getPreferredScrollableViewportSize();
+        return result;
       }
-      return new Dimension(super.getPreferredScrollableViewportSize().width, getPreferredSize().height);
+      result.height = getPreferredSize().height;
+      return result;
     }
 
     @Override