From 51981de830957fbd89a5ba5a35bb91429c70bb44 Mon Sep 17 00:00:00 2001 From: Mikhail Sokolov Date: Wed, 10 Oct 2018 18:41:03 +0300 Subject: [PATCH] IDEA-199381 New SE: need to add a minimum height for the result area --- .../searcheverywhere/SearchEverywhereManagerImpl.java | 6 ++++++ .../actions/searcheverywhere/SearchEverywhereUI.java | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereManagerImpl.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereManagerImpl.java index 0b8ae3d7f511..b2da2d386393 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereManagerImpl.java @@ -226,6 +226,10 @@ public class SearchEverywhereManagerImpl implements SearchEverywhereManager { return; } + Dimension minSize = mySearchEverywhereUI.getMinimumSize(); + JBInsets.addTo(minSize, myBalloon.getContent().getInsets()); + myBalloon.setMinimumSize(minSize); + if (viewType == SearchEverywhereUI.ViewType.SHORT) { myBalloonFullSize = myBalloon.getSize(); JBInsets.removeFrom(myBalloonFullSize, myBalloon.getContent().getInsets()); @@ -235,6 +239,8 @@ public class SearchEverywhereManagerImpl implements SearchEverywhereManager { myBalloonFullSize = mySearchEverywhereUI.getPreferredSize(); JBInsets.addTo(myBalloonFullSize, myBalloon.getContent().getInsets()); } + myBalloonFullSize.height = Integer.max(myBalloonFullSize.height, minSize.height); + myBalloonFullSize.width = Integer.max(myBalloonFullSize.width, minSize.width); myBalloon.setSize(myBalloonFullSize); } }); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java index 0d563cd54b5e..5f9f5dccdbf6 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java @@ -74,6 +74,7 @@ public class SearchEverywhereUI extends BigPopupUI implements DataProvider, Quic public static final int SINGLE_CONTRIBUTOR_ELEMENTS_LIMIT = 30; public static final int MULTIPLE_CONTRIBUTORS_ELEMENTS_LIMIT = 15; public static final int THROTTLING_TIMEOUT = 200; + public static final int MINIMAL_SUGGESTIONS_LIST_HEIGHT= 100; private final List myServiceContributors; private final List myShownContributors; @@ -135,6 +136,15 @@ public class SearchEverywhereUI extends BigPopupUI implements DataProvider, Quic }); } + @Override + public Dimension getMinimumSize() { + Dimension size = super.getMinimumSize(); + if (getViewType() == ViewType.FULL) { + size.height += MINIMAL_SUGGESTIONS_LIST_HEIGHT; + } + return size; + } + @Override @NotNull protected CompositeCellRenderer createCellRenderer() {