MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Reduced width for ComboBox in borderless mode, similar to 23.3 version

Browse Source 
GitOrigin-RevId: ff050f74069a43ca6546ea2b4b322f7bfd02d67a
This commit is contained in:
Pavel Porvatov
2024-03-25 11:31:51 +00:00
committed by intellij-monorepo-bot
parent 73d53ffcde
commit e431a3e60e
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxBorder.kt
+3 -3
View File
@@ -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())
}
platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
+8 -3
View File
@@ -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);
}