From d6c0ebd4dc5862644deec7c00e6dc6518a2ce808 Mon Sep 17 00:00:00 2001 From: Sergey Simonchik Date: Sat, 28 Mar 2015 10:22:06 +0300 Subject: [PATCH] respect action button minimum size --- .../com/intellij/openapi/actionSystem/impl/ActionButton.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java index 203605cdad08..51b8c464a923 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java @@ -71,7 +71,6 @@ public class ActionButton extends JComponent implements ActionButtonComponent, A myPlace = place; setFocusable(false); enableEvents(AWTEvent.MOUSE_EVENT_MASK); - myMinimumButtonSize = JBDimension.create(minimumSize); putClientProperty(UIUtil.CENTER_TOOLTIP_DEFAULT, Boolean.TRUE); } @@ -196,8 +195,8 @@ public class ActionButton extends JComponent implements ActionButtonComponent, A } else { return new Dimension( - icon.getIconWidth() + myInsets.left + myInsets.right, - icon.getIconHeight() + myInsets.top + myInsets.bottom + Math.max(myMinimumButtonSize.width, icon.getIconWidth() + myInsets.left + myInsets.right), + Math.max(myMinimumButtonSize.height, icon.getIconHeight() + myInsets.top + myInsets.bottom) ); } }