From c1c97dde027579ec980ff7c2286ce4848f6bc4a6 Mon Sep 17 00:00:00 2001
From: "elena.korotkova" <elena.korotkova@jetbrains.com>
Date: Mon, 27 Dec 2021 00:08:07 +0100
Subject: [PATCH] New toolbar: limit search size

GitOrigin-RevId: 869dddced0d6e6962d9e50638ae17db4e824571d
---
 .../experimental/NewToolbarBorderLayout.kt          | 13 +------------
 .../SearchEverywhereNewToolbarAction.kt             |  6 +++++-
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/experimental/NewToolbarBorderLayout.kt b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/experimental/NewToolbarBorderLayout.kt
index 95f3eed9e08b..192f08c0325c 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/experimental/NewToolbarBorderLayout.kt
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/experimental/NewToolbarBorderLayout.kt
@@ -38,18 +38,7 @@ class NewToolbarBorderLayout : BorderLayout() {
       var left = insets.left
       var right = target.width - insets.right
       var c: Component?
-      if (getLayoutComponent(NORTH).also { c = it } != null) {
-        c!!.setSize(right - left, c!!.height)
-        val d = c!!.preferredSize
-        c!!.setBounds(left, top, right - left, d.height)
-        top += d.height + vgap
-      }
-      if (getLayoutComponent(SOUTH).also { c = it } != null) {
-        c!!.setSize(right - left, c!!.height)
-        val d = c!!.preferredSize
-        c!!.setBounds(left, bottom - d.height, right - left, d.height)
-        bottom -= d.height + vgap
-      }
+
       if (getLayoutComponent(EAST).also { c = it } != null) {
         c!!.setSize(c!!.width, bottom - top)
         val d = c!!.preferredSize
diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/experimental/SearchEverywhereNewToolbarAction.kt b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/experimental/SearchEverywhereNewToolbarAction.kt
index 5c24cf547249..de62d1e2b92b 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/experimental/SearchEverywhereNewToolbarAction.kt
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/experimental/SearchEverywhereNewToolbarAction.kt
@@ -93,13 +93,17 @@ class SearchEverywhereNewToolbarAction : SearchEverywhereAction(), AnActionListe
           override fun ancestorAdded(event: AncestorEvent?) {
             rootPane?.addComponentListener(object : ComponentAdapter() {
               override fun componentResized(e: ComponentEvent?) {
-                checkIfEnoughSpace()
+                shouldShow = true
               }
             })
           }
         })
       }
 
+      override fun getPreferredSize(): Dimension {
+        return Dimension(super.getPreferredSize().width, ActionToolbar.DEFAULT_MINIMUM_BUTTON_SIZE.height)
+      }
+
       override fun updateToolTipText() {
         val shortcutText = getShortcut()
         val classesTabName = java.lang.String.join("/", getActionTitlePluralized())