This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 1393f5f [NETBEANS-3737] FlatLaf: fix cramped Toolbar icons new ef2dc1b Merge pull request #1917 from DevCharly/flatlaf-toolbar-icons 1393f5f is described below commit 1393f5f5c02142fdb56214da6c41899d1a4a5b1e Author: Karl Tauber <k...@jformdesigner.com> AuthorDate: Tue Feb 4 11:04:03 2020 +0100 [NETBEANS-3737] FlatLaf: fix cramped Toolbar icons --- platform/openide.loaders/src/org/openide/awt/Toolbar.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/openide.loaders/src/org/openide/awt/Toolbar.java b/platform/openide.loaders/src/org/openide/awt/Toolbar.java index e9fb162..9cf9b40 100644 --- a/platform/openide.loaders/src/org/openide/awt/Toolbar.java +++ b/platform/openide.loaders/src/org/openide/awt/Toolbar.java @@ -24,7 +24,6 @@ import java.awt.Component; import java.awt.Insets; import java.awt.event.ActionEvent; import java.beans.PropertyChangeListener; -import java.io.File; import java.io.IOException; import java.util.EventListener; import java.util.EventObject; @@ -78,6 +77,9 @@ public class Toolbar extends ToolbarWithOverflow /*implemented by patchsuperclas //needed to turn off the painting of toolbar button borders on ocean private static final boolean isMetalLaF = MetalLookAndFeel.class.isAssignableFrom(UIManager.getLookAndFeel().getClass()); + + private static final boolean isFlatLaF = + UIManager.getLookAndFeel().getID().startsWith("FlatLaf"); static final long serialVersionUID = 5011742660516204764L; static { @@ -182,7 +184,7 @@ public class Toolbar extends ToolbarWithOverflow /*implemented by patchsuperclas } //This is active for GTK L&F. It should be fixed in JDK //but it is not fixed in JDK 6.0. - if (!isMetalLaF) { + if (!isMetalLaF && !isFlatLaF) { ((AbstractButton) c).setMargin( emptyInsets ); } if( null != label && c != label ) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists