diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java index 6bbce9d5d6b1..cbe16f4079d5 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java @@ -744,15 +744,15 @@ public class FindPopupPanel extends JBPanel implements FindUI { myTitlePanel.add(myTitleLabel); myTitlePanel.add(myLoadingDecorator.getComponent(), "w 24, wmin 24"); myTitlePanel.add(Box.createHorizontalGlue(), "growx, pushx"); - int gap = JBUI.scale(16); + int gap = 16; JPanel regexpPanel = new JPanel(new BorderLayout(JBUI.scale(4), 0)); regexpPanel.add(myCbRegularExpressions, BorderLayout.CENTER); regexpPanel.add(RegExHelpPopup.createRegExLink("?", myCbRegularExpressions, LOG), BorderLayout.EAST); AnAction[] actions = { - new DefaultCustomComponentAction(() -> JBUI.Borders.emptyRight(gap).wrap(myCbCaseSensitive)), - new DefaultCustomComponentAction(() -> JBUI.Borders.emptyRight(gap).wrap(myCbPreserveCase)), - new DefaultCustomComponentAction(() -> JBUI.Borders.emptyRight(gap).wrap(myCbWholeWordsOnly)), - new DefaultCustomComponentAction(() -> regexpPanel), + new DefaultCustomComponentAction(() -> myCbCaseSensitive), + new DefaultCustomComponentAction(() -> JBUI.Borders.emptyLeft(gap).wrap(myCbPreserveCase)), + new DefaultCustomComponentAction(() -> JBUI.Borders.emptyLeft(gap).wrap(myCbWholeWordsOnly)), + new DefaultCustomComponentAction(() -> JBUI.Borders.emptyLeft(gap).wrap(regexpPanel)), }; @SuppressWarnings("InspectionUniqueToolbarId") 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 index 9a3493000cb6..fd2d9d71d658 100644 --- 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 @@ -71,6 +71,9 @@ public class DarculaCheckBoxUI extends MetalCheckBoxUI { } protected Rectangle updateViewRect(AbstractButton b, Rectangle viewRect) { + if (!(b.getBorder() instanceof DarculaCheckBoxBorder)) { + JBInsets.removeFrom(viewRect, b.getInsets()); + } return viewRect; } 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 index 64307a210d29..e40c1c82ce0e 100644 --- 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 @@ -65,6 +65,9 @@ public class DarculaRadioButtonUI extends MetalRadioButtonUI { } protected Rectangle updateViewRect(AbstractButton b, Rectangle viewRect) { + if (!(b.getBorder() instanceof DarculaRadioButtonBorder)) { + JBInsets.removeFrom(viewRect, b.getInsets()); + } return viewRect; } diff --git a/platform/util/src/com/intellij/util/ui/JBUI.java b/platform/util/src/com/intellij/util/ui/JBUI.java index f21e6042c692..a54a85142dfa 100644 --- a/platform/util/src/com/intellij/util/ui/JBUI.java +++ b/platform/util/src/com/intellij/util/ui/JBUI.java @@ -519,8 +519,8 @@ public class JBUI { @NotNull public static JBInsets insets(String propName, JBInsets defaultValue) { - JBInsets i = (JBInsets)UIManager.getInsets(propName); - return i != null ? i : defaultValue; + Insets i = UIManager.getInsets(propName); + return i != null ? JBInsets.create(i) : defaultValue; } @NotNull