(cayenne) branch master updated: trying to space windows buttons , they are too cramped ... since 2018!

[aadamchik]

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/master by this push:
     new a6e2c67e6 trying to space windows buttons , they are too cramped ... 
since 2018!
a6e2c67e6 is described below

commit a6e2c67e6d84885ca9446f300966c021c2db9b7c
Author: Andrus Adamchik <and...@objectstyle.com>
AuthorDate: Fri May 22 20:01:49 2026 -0400

    trying to space windows buttons , they are too cramped ... since 2018!
    
    take 4 - actually use the configured insets
---
 .../org/apache/cayenne/modeler/platform/win/WinUIInitializer.java    | 3 +--
 .../src/main/java/org/apache/cayenne/modeler/toolkit/AppAction.java  | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/win/WinUIInitializer.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/win/WinUIInitializer.java
index 5c1e8575f..f74fa24bf 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/win/WinUIInitializer.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/win/WinUIInitializer.java
@@ -25,7 +25,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.swing.*;
-import javax.swing.plaf.InsetsUIResource;
 import java.awt.*;
 
 public class WinUIInitializer implements UIInitializer {
@@ -75,6 +74,6 @@ public class WinUIInitializer implements UIInitializer {
         UIManager.put("CheckBoxMenuItem.opaque", Boolean.TRUE);
         UIManager.put("RadioButtonMenuItem.opaque", Boolean.TRUE);
         UIManager.put("Button.border", BorderFactory.createEmptyBorder());
-        UIManager.put("Button.margin", new InsetsUIResource(4, 4, 4, 4));
+        UIManager.put("ToolBar.buttonMargin", new Insets(4, 4, 4, 4));
     }
 }
diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppAction.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppAction.java
index 57e18a6cf..87d31490a 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppAction.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppAction.java
@@ -31,6 +31,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.swing.*;
+import java.awt.Insets;
 import java.awt.event.ActionEvent;
 
 /**
@@ -227,6 +228,10 @@ public abstract class AppAction extends AbstractAction {
             setDisabledIcon(IconFactory.disabledIcon(getIcon()));
             setFocusPainted(false);
             setFocusable(false);
+            Insets margin = UIManager.getInsets("ToolBar.buttonMargin");
+            if (margin != null) {
+                setMargin(margin);
+            }
             putClientProperty("JButton.buttonType", "segmentedTextured");
             putClientProperty("JButton.segmentPosition", POSITIONS[position]);
         }