From e431a3e60eaba5a622e507dd6d989ebe9293efaf Mon Sep 17 00:00:00 2001
From: Pavel Porvatov <Pavel.Porvatov@jetbrains.com>
Date: Mon, 25 Mar 2024 09:44:01 +0100
Subject: [PATCH] Reduced width for ComboBox in borderless mode, similar to
 23.3 version

GitOrigin-RevId: ff050f74069a43ca6546ea2b4b322f7bfd02d67a
---
 .../ide/ui/laf/darcula/ui/DarculaComboBoxBorder.kt    |  6 +++---
 .../ide/ui/laf/darcula/ui/DarculaComboBoxUI.java      | 11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxBorder.kt b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxBorder.kt
index afb5ddcff154..367869ad8417 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxBorder.kt
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxBorder.kt
@@ -45,7 +45,7 @@ open class DarculaComboBoxBorder : Border, ErrorBorderCapable, UIResource {
       return when (getType(c)) {
         Type.TABLE_CELL_EDITOR, Type.COMPACT -> JBInsets.create(2, 3)
         Type.EMBEDDED -> JBUI.insets(2)
-        Type.BORDERLESS -> JBInsets.emptyInsets()
+        Type.BORDERLESS -> JBUI.insets(1)
         Type.DEFAULT -> DarculaComboBoxUI.getDefaultComboBoxInsets()
       }
     }
@@ -104,12 +104,12 @@ open class DarculaComboBoxBorder : Border, ErrorBorderCapable, UIResource {
     }
   }
 
-  protected fun paintNormalBorder(g: Graphics2D, comboBox: JComboBox<*>, r: Rectangle, focused: Boolean) {
+  private fun paintNormalBorder(g: Graphics2D, comboBox: JComboBox<*>, r: Rectangle, focused: Boolean) {
     JBInsets.removeFrom(r, getBorderInsets(comboBox))
     paintComponentBorder(g, r, DarculaUIUtil.getOutline(comboBox), focused, comboBox.isEnabled)
   }
 
-  protected fun paintBorderlessBorder(g: Graphics2D, comboBox: JComboBox<*>, r: Rectangle, focused: Boolean) {
+  private fun paintBorderlessBorder(g: Graphics2D, comboBox: JComboBox<*>, r: Rectangle, focused: Boolean) {
     JBInsets.removeFrom(r, getBorderInsets(comboBox))
     paintComponentBorder(g, r, DarculaUIUtil.getOutline(comboBox), focused, comboBox.isEnabled, bw = DarculaUIUtil.LW.get())
   }
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
index e38fcad2fbb5..0ffff2ccb9b5 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
@@ -278,9 +278,14 @@ public class DarculaComboBoxUI extends BasicComboBoxUI implements Border, ErrorB
     return JBUI.CurrentTheme.Arrow.backgroundColor(comboBox.isEnabled(), comboBox.isEditable());
   }
 
+  private static Dimension getMinimumSize(@NotNull JComboBox<?> comboBox) {
+    Dimension result = JBUI.CurrentTheme.ComboBox.minimumSize();
+    return isBorderless(comboBox) ? new Dimension(result.width, result.height - JBUIScale.scale(4)) : result;
+  }
+
   private static @NotNull Dimension getArrowButtonPreferredSize(@NotNull JComboBox<?> comboBox) {
     Insets i = comboBox.getInsets();
-    int height = (isCompact(comboBox) ? COMPACT_HEIGHT.get() : JBUI.CurrentTheme.ComboBox.minimumSize().height) + i.top + i.bottom;
+    int height = (isCompact(comboBox) ? COMPACT_HEIGHT.get() : getMinimumSize(comboBox).height) + i.top + i.bottom;
     return new Dimension(JBUI.CurrentTheme.Component.ARROW_AREA_WIDTH.get() + i.right, height);
   }
 
@@ -644,7 +649,7 @@ public class DarculaComboBoxUI extends BasicComboBoxUI implements Border, ErrorB
       JBInsets.removeFrom(size, padding); // don't count paddings in compact mode
     }
 
-    Dimension minSize = JBUI.CurrentTheme.ComboBox.minimumSize();
+    Dimension minSize = getMinimumSize(comboBox);
     int editorHeight = editorSize != null ? editorSize.height + i.top + i.bottom : 0;
     int editorWidth = editorSize != null ? editorSize.width + i.left + padding.left + padding.right : 0;
     editorWidth = Math.max(editorWidth, minSize.width + i.left);
@@ -668,7 +673,7 @@ public class DarculaComboBoxUI extends BasicComboBoxUI implements Border, ErrorB
   public Dimension getMinimumSize(JComponent c) {
     Dimension minSize = super.getMinimumSize(c);
     Insets i = c.getInsets();
-    minSize.width = JBUI.CurrentTheme.ComboBox.minimumSize().width + JBUI.CurrentTheme.Component.ARROW_AREA_WIDTH.get() + i.left + i.right;
+    minSize.width = getMinimumSize(comboBox).width + JBUI.CurrentTheme.Component.ARROW_AREA_WIDTH.get() + i.left + i.right;
     return getSizeWithButton(minSize, editor != null ? editor.getMinimumSize() : null);
   }