From c0f278459988ad647bbf849551bdc201abcaee23 Mon Sep 17 00:00:00 2001 From: mmatessi Date: Fri, 21 Feb 2020 10:32:25 +0100 Subject: [PATCH] FlatButtonUI.getPreferredSize fix nullPointer when button.getComponentCount()>0 --- .../src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java index c9152d76..cecd75b8 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java @@ -398,7 +398,9 @@ public class FlatButtonUI if( isHelpButton( c ) ) return new Dimension( helpButtonIcon.getIconWidth(), helpButtonIcon.getIconHeight() ); - Dimension prefSize = super.getPreferredSize( c ); + Dimension prefSize = super.getPreferredSize(c); + if ( prefSize == null ) + return null; // make button square if it is a icon-only button // or apply minimum width, if not in toolbar and not a icon-only button