IDEA-286480 CheckBox baseline is incorrect on JBR17

pporvatov · intellij-monorepo-bot · commit 0c9c9f7d370b · 2022-08-18T21:50:02.000Z
- Refactored Checkbox/RadioButton preferred size methods (functionality shouldn't be affected)

GitOrigin-RevId: 6f29d2deef071a922cc4b4059b422b9739e63f50
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/AbstractButtonLayout.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/AbstractButtonLayout.java
@@ -15,21 +15,23 @@ class AbstractButtonLayout {
   public final Rectangle textRect = new Rectangle();
 
   private final AbstractButton button;
+  private final Dimension size;
+  private final boolean removeInsetsBeforeLayout;
   private final String text;
   private final FontMetrics fontMetrics;
-  private final Dimension size;
 
   /**
    * @param removeInsetsBeforeLayout remove insets before layout. A very strange parameter, looks like a hack because of the following bug:
    *                                 CheckBox.borderInsets (RadioButton as well) property ignores top/bottom offsets while vertical align.
    *                                 Normally should be always true and removed later
    */
-  AbstractButtonLayout(AbstractButton button, boolean removeInsetsBeforeLayout, Icon defaultIcon) {
+  AbstractButtonLayout(AbstractButton button, Dimension size, boolean removeInsetsBeforeLayout, Icon defaultIcon) {
     this.button = button;
-    size = button.getSize();
+    this.size = size;
+    this.removeInsetsBeforeLayout = removeInsetsBeforeLayout;
     fontMetrics = button.getFontMetrics(button.getFont());
 
-    Rectangle viewRect = new Rectangle(button.getSize());
+    Rectangle viewRect = new Rectangle(size);
     if (removeInsetsBeforeLayout) {
       JBInsets.removeFrom(viewRect, button.getInsets());
     }
@@ -38,7 +40,8 @@ class AbstractButtonLayout {
       button, fontMetrics, button.getText(), defaultIcon,
       button.getVerticalAlignment(), button.getHorizontalAlignment(),
       button.getVerticalTextPosition(), button.getHorizontalTextPosition(),
-      viewRect, iconRect, textRect, button.getIconTextGap());
+      viewRect, iconRect, textRect,
+      button.getText() == null ? 0 : button.getIconTextGap());
   }
 
   public void paint(Graphics g, Color disabledTextColor, int mnemonicIndex) {
@@ -50,6 +53,28 @@ public void paint(Graphics g, Color disabledTextColor, int mnemonicIndex) {
     drawText(g, disabledTextColor, mnemonicIndex);
   }
 
+  public Dimension getPreferredSize() {
+    Insets insets = button.getInsets();
+    Rectangle iconRectResult;
+    // todo a strange logic that should be revised together with removeInsetsBeforeLayout
+    // The following code looks more logical
+    /*
+    Rectangle rect = iconRect.union(textRect);
+    JBInsets.addTo(rect, button.getInsets());
+    return new Dimension(rect.width, rect.height);
+    */
+    if (removeInsetsBeforeLayout) {
+      iconRectResult = iconRect.getBounds();
+      JBInsets.addTo(iconRectResult, insets);
+    } else {
+      iconRectResult = iconRect;
+    }
+    Rectangle textRectResult = textRect.getBounds();
+    JBInsets.addTo(textRectResult, insets);
+    Rectangle rect = iconRectResult.union(textRectResult);
+    return new Dimension(rect.width, rect.height);
+  }
+
   private void drawText(Graphics g, Color disabledTextColor, int mnemonicIndex) {
     if (text != null) {
       View v = (View)button.getClientProperty(BasicHTML.propertyKey);
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaCheckBoxUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaCheckBoxUI.java
@@ -5,8 +5,10 @@
 import com.intellij.ide.ui.laf.darcula.DarculaUIUtil;
 import com.intellij.ui.ComponentUtil;
 import com.intellij.ui.scale.JBUIScale;
-import com.intellij.util.ui.*;
-import org.jetbrains.annotations.Nullable;
+import com.intellij.util.ui.EmptyIcon;
+import com.intellij.util.ui.LafIconLookup;
+import com.intellij.util.ui.MacUIUtil;
+import com.intellij.util.ui.ThreeStateCheckBox;
 
 import javax.swing.*;
 import javax.swing.plaf.ComponentUI;
@@ -71,7 +73,7 @@ protected int textIconGap() {
   public void paint(Graphics g2d, JComponent c) {
     Graphics2D g = (Graphics2D)g2d;
     AbstractButton button = (AbstractButton)c;
-    AbstractButtonLayout layout = new AbstractButtonLayout(button, removeInsetsBeforeLayout(button), getDefaultIcon());
+    AbstractButtonLayout layout = new AbstractButtonLayout(button, button.getSize(), removeInsetsBeforeLayout(button), getDefaultIcon());
 
     layout.paint(g, getDisabledTextColor(), getMnemonicIndex(button));
     drawCheckIcon(c, g, button, layout.iconRect, button.isSelected(), button.isEnabled());
@@ -117,75 +119,17 @@ protected int getMnemonicIndex(AbstractButton b) {
 
   @Override
   public Dimension getPreferredSize(JComponent c) {
-    Dimension dimension = computeOurPreferredSize(c);
-    return dimension != null ? dimension : super.getPreferredSize(c);
+    AbstractButton button = (AbstractButton)c;
+    AbstractButtonLayout layout = new AbstractButtonLayout(button, new Dimension(Short.MAX_VALUE, Short.MAX_VALUE),
+                                                           removeInsetsBeforeLayout(button), getDefaultIcon());
+    return layout.getPreferredSize();
   }
 
   @Override
   public Dimension getMaximumSize(JComponent c) {
     return getPreferredSize(c);
   }
 
-  protected Dimension computeOurPreferredSize(JComponent c) {
-    return computeCheckboxPreferredSize(c, getDefaultIcon());
-  }
-
-  /**
-   * @see javax.swing.plaf.basic.BasicRadioButtonUI#getPreferredSize
-   * The difference is that we do not include `DarculaCheckBoxBorder` insets to the icon size.
-   */
-  @Nullable
-  static Dimension computeCheckboxPreferredSize(JComponent c, Icon defaultIcon) {
-    if (c.getComponentCount() > 0) {
-      return null;
-    }
-
-    AbstractButton b = (AbstractButton)c;
-    Rectangle prefViewRect = new Rectangle();
-    Rectangle prefIconRect = new Rectangle();
-    Rectangle prefTextRect = new Rectangle();
-
-    String text = b.getText();
-
-    Icon buttonIcon = b.getIcon();
-    if (buttonIcon == null) {
-      buttonIcon = defaultIcon;
-    }
-
-    Font font = b.getFont();
-    FontMetrics fm = b.getFontMetrics(font);
-
-    prefViewRect.x = prefViewRect.y = 0;
-    prefViewRect.width = Short.MAX_VALUE;
-    prefViewRect.height = Short.MAX_VALUE;
-    prefIconRect.x = prefIconRect.y = prefIconRect.width = prefIconRect.height = 0;
-    prefTextRect.x = prefTextRect.y = prefTextRect.width = prefTextRect.height = 0;
-
-    SwingUtilities.layoutCompoundLabel(
-      c, fm, text, buttonIcon,
-      b.getVerticalAlignment(), b.getHorizontalAlignment(),
-      b.getVerticalTextPosition(), b.getHorizontalTextPosition(),
-      prefViewRect, prefIconRect, prefTextRect,
-      text == null ? 0 : b.getIconTextGap());
-
-    Insets insets = b.getInsets();
-    if (!(b.getBorder() instanceof DarculaCheckBoxBorder)) {
-      JBInsets.addTo(prefIconRect, insets);
-    }
-    JBInsets.addTo(prefTextRect, insets);
-
-    // find the union of the icon and text rects (from Rectangle.java)
-    int x1 = Math.min(prefIconRect.x, prefTextRect.x);
-    int x2 = Math.max(prefIconRect.x + prefIconRect.width,
-                      prefTextRect.x + prefTextRect.width);
-    int y1 = Math.min(prefIconRect.y, prefTextRect.y);
-    int y2 = Math.max(prefIconRect.y + prefIconRect.height,
-                      prefTextRect.y + prefTextRect.height);
-    int width = x2 - x1;
-    int height = y2 - y1;
-    return new Dimension(width, height);
-  }
-
   @Override
   public Icon getDefaultIcon() {
     return DEFAULT_ICON;
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaRadioButtonUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaRadioButtonUI.java
@@ -67,7 +67,7 @@ private static void updateTextPosition(AbstractButton b) {
   public void paint(Graphics g2d, JComponent c) {
     Graphics2D g = (Graphics2D)g2d;
     AbstractButton button = (AbstractButton)c;
-    AbstractButtonLayout layout = new AbstractButtonLayout(button, removeInsetsBeforeLayout(button), getDefaultIcon());
+    AbstractButtonLayout layout = new AbstractButtonLayout(button, button.getSize(), removeInsetsBeforeLayout(button), getDefaultIcon());
 
     layout.paint(g, getDisabledTextColor(), getMnemonicIndex(button));
     paintFocus(button, g, layout.textRect);
@@ -96,19 +96,17 @@ protected int getMnemonicIndex(AbstractButton b) {
 
   @Override
   public Dimension getPreferredSize(JComponent c) {
-    Dimension dimension = computeOurPreferredSize(c);
-    return dimension != null ? dimension : super.getPreferredSize(c);
+    AbstractButton button = (AbstractButton)c;
+    AbstractButtonLayout layout = new AbstractButtonLayout(button, new Dimension(Short.MAX_VALUE, Short.MAX_VALUE),
+                                                           removeInsetsBeforeLayout(button), getDefaultIcon());
+    return layout.getPreferredSize();
   }
 
   @Override
   public Dimension getMaximumSize(JComponent c) {
     return getPreferredSize(c);
   }
 
-  protected Dimension computeOurPreferredSize(JComponent c) {
-    return DarculaCheckBoxUI.computeCheckboxPreferredSize(c, getDefaultIcon());
-  }
-
   @Override
   protected void paintFocus(Graphics g, Rectangle t, Dimension d) {}
 
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/uiDslTestAction/CheckBoxRadioButtonPanel.kt b/platform/platform-impl/src/com/intellij/internal/ui/uiDslTestAction/CheckBoxRadioButtonPanel.kt
@@ -0,0 +1,95 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.internal.ui.uiDslTestAction
+
+import com.intellij.ui.components.JBCheckBox
+import com.intellij.ui.components.JBRadioButton
+import com.intellij.ui.dsl.builder.Cell
+import com.intellij.ui.dsl.builder.DslComponentProperty
+import com.intellij.ui.dsl.builder.panel
+import com.intellij.ui.dsl.gridLayout.Gaps
+import com.intellij.ui.dsl.gridLayout.VerticalAlign
+import com.intellij.util.ui.JBUI
+import org.jetbrains.annotations.ApiStatus
+import java.awt.Color
+import javax.swing.BoxLayout
+import javax.swing.JCheckBox
+import javax.swing.JPanel
+import javax.swing.JToggleButton
+import javax.swing.border.Border
+
+@Suppress("DialogTitleCapitalization")
+@ApiStatus.Internal
+internal class CheckBoxRadioButtonPanel {
+  val panel = panel {
+    row {
+      panel {
+        buttonsGroup {
+          row {
+            label("Marker")
+          }
+          for (i in 1..5) {
+            row { checkBox("DcheckBox$i") }
+          }
+        }
+      }.resizableColumn()
+        .verticalAlign(VerticalAlign.TOP)
+      panel {
+        row {
+          label("Marker")
+        }
+        buttonsGroup {
+          for (i in 1..5) {
+            row { radioButton("DradioButton$i") }
+          }
+        }
+      }.resizableColumn()
+        .verticalAlign(VerticalAlign.TOP)
+    }
+
+    buttonsGroup {
+      row {
+        checkBox("Border: 2,10,20,30")
+          .customize(Color.GREEN, JBUI.Borders.customLine(Color.ORANGE, 2, 10, 20, 30))
+
+        radioButton("Border: 10,20,30,2")
+          .customize(Color.ORANGE, JBUI.Borders.customLine(Color.GREEN, 10, 20, 30, 2))
+
+        checkBox("Border: 0,0,0,0")
+          .customize(Color.GREEN, JBUI.Borders.customLine(Color.ORANGE, 0, 0, 0, 0))
+
+        radioButton("Border: 0,0,0,0")
+          .customize(Color.ORANGE, JBUI.Borders.customLine(Color.GREEN, 0, 0, 0, 0))
+      }
+    }
+
+    buttonsGroup {
+      row {
+        val checkBox = JBCheckBox()
+        cell(checkBox)
+          .comment("checkBox(null), prefSize = ${checkBox.preferredSize}")
+
+        val radioButton = JBRadioButton()
+        cell(radioButton)
+          .comment("radioButton(null), prefSize = ${radioButton.preferredSize}")
+      }
+    }
+
+    row {
+      val panel = JPanel()
+      panel.layout = BoxLayout(panel, BoxLayout.Y_AXIS)
+      for (i in 1..5) {
+        panel.add(JCheckBox("BoxLayout$i"))
+      }
+      cell(panel)
+    }
+  }
+}
+
+private fun Cell<JToggleButton>.customize(background: Color, border: Border) {
+  applyToComponent {
+    isOpaque = true
+    this.background = background
+    this.border = border
+    putClientProperty(DslComponentProperty.VISUAL_PADDINGS, Gaps.EMPTY)
+  }
+}
diff --git a/platform/platform-impl/src/com/intellij/internal/ui/uiDslTestAction/UiDslTestAction.kt b/platform/platform-impl/src/com/intellij/internal/ui/uiDslTestAction/UiDslTestAction.kt
@@ -59,6 +59,7 @@ private class UiDslTestDialog(project: Project?) : DialogWrapper(project, null,
     result.addTab("Resizable Rows", createResizableRows())
     result.addTab("Others", OthersPanel().panel)
     result.addTab("Deprecated Api", JScrollPane(DeprecatedApiPanel().panel))
+    result.addTab("CheckBox/RadioButton", CheckBoxRadioButtonPanel().panel)
 
     return result
   }
diff --git a/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJCheckBoxUI.java b/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJCheckBoxUI.java
@@ -31,11 +31,6 @@ protected boolean removeInsetsBeforeLayout(AbstractButton b) {
     return true;
   }
 
-  @Override
-  protected Dimension computeOurPreferredSize(JComponent c) {
-    return null;
-  }
-
   @Override
   protected void drawCheckIcon(JComponent c, Graphics2D g, AbstractButton b, Rectangle iconRect, boolean selected, boolean enabled) {
     Graphics2D g2 = (Graphics2D)g.create();
diff --git a/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJRadioButtonUI.java b/plugins/laf/win10/src/com/intellij/laf/win10/WinIntelliJRadioButtonUI.java
@@ -20,11 +20,6 @@ protected boolean removeInsetsBeforeLayout(AbstractButton b) {
     return true;
   }
 
-  @Override
-  protected Dimension computeOurPreferredSize(JComponent c) {
-    return null;
-  }
-
   @SuppressWarnings({"MethodOverridesStaticMethodOfSuperclass", "UnusedDeclaration"})
   public static ComponentUI createUI(JComponent c) {
     AbstractButton b = (AbstractButton)c;

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ private class UiDslTestDialog(project: Project?) : DialogWrapper(project, null,`
`59`	`59`	`result.addTab("Resizable Rows", createResizableRows())`
`60`	`60`	`result.addTab("Others", OthersPanel().panel)`
`61`	`61`	`result.addTab("Deprecated Api", JScrollPane(DeprecatedApiPanel().panel))`
	`62`	`+ result.addTab("CheckBox/RadioButton", CheckBoxRadioButtonPanel().panel)`
`62`	`63`
`63`	`64`	`return result`
`64`	`65`	`}`