From 992c5ac31e859f04dc6e8ef772553741dfc2f39f Mon Sep 17 00:00:00 2001
From: "Vassiliy.Kudryashov" <Vassiliy.Kudryashov@jetbrains.com>
Date: Thu, 16 Jul 2015 22:06:56 +0300
Subject: [PATCH] IDEA-142359 Find/Replace: move checkboxes back Stage #3

---
 .../intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java  | 4 ++++
 .../intellij/openapi/actionSystem/impl/ActionToolbarImpl.java | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java
index 7248b9648c38..94ea52807eed 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java
@@ -16,6 +16,7 @@
 package com.intellij.ide.ui.laf.darcula.ui;
 
 import com.intellij.ide.ui.laf.darcula.DarculaUIUtil;
+import com.intellij.openapi.actionSystem.ActionToolbar;
 import com.intellij.openapi.ui.GraphicsConfig;
 import com.intellij.ui.Gray;
 import com.intellij.util.ui.JBUI;
@@ -71,6 +72,9 @@ public class DarculaButtonPainter implements Border, UIResource {
 
   @Override
   public Insets getBorderInsets(Component c) {
+    if (c.getParent() instanceof ActionToolbar) {
+      return JBUI.insets(4, 16, 4, 16);
+    }
     if (DarculaButtonUI.isSquare(c)) {
       return JBUI.insets(2, 0, 2, 0).asUIResource();
     }
diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
index 04a2c0a6fff8..4dfa9f7a8ee7 100644
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
@@ -349,7 +349,7 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar {
       customComponent = ((CustomComponentAction)action).createCustomComponent(presentation);
       presentation.putClientProperty(CustomComponentAction.CUSTOM_COMPONENT_PROPERTY, customComponent);
     }
-    if (customComponent instanceof JCheckBox && UIUtil.isUnderWindowsLookAndFeel()) {
+    if (customComponent instanceof JCheckBox) {
       customComponent.setBorder(JBUI.Borders.empty(0, 9, 0, 0));
     }
     tweakActionComponentUI(customComponent);
@@ -517,7 +517,7 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar {
     if (myOrientation == SwingConstants.HORIZONTAL) {
       int eachX = insets.left;
       int eachY = insets.top;
-      int maxHeight = 0;
+      int maxHeight = sizeToFit.height;
       for (int i = 0; i < componentCount; i++) {
         final Component eachComp = getComponent(i);
         final boolean isLast = i == componentCount - 1;