IDEA-147259 "Find Usages" popup is 2 pixels too small, showing unnecessary scrollbar

platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java

@@ -1075,7 +1075,8 @@ public class ShowUsagesAction extends AnAction implements PopupAction {
 
     int footer = footerSize.height;
     int footerBorder = footer == 0 ? 0 : 1;
-    rectangle.height += headerSize.height + footer + footerBorder;
+    Insets insets = ((AbstractPopup)popup).getPopupBorder().getBorderInsets(content);
+    rectangle.height += headerSize.height + footer + footerBorder + insets.top + insets.bottom;
     ScreenUtil.fitToScreen(rectangle);
     Dimension newDim = rectangle.getSize();
     window.setBounds(rectangle);

platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java

@@ -395,6 +395,11 @@ public class AbstractPopup implements JBPopup {
     setAdText(s, SwingConstants.LEFT);
   }
 
+  @NotNull
+  public PopupBorder getPopupBorder() {
+    return myPopupBorder;
+  }
+
   @Override
   public void setAdText(@NotNull final String s, int alignment) {
     if (myAdComponent == null) {