Changeset 8358 in josm

Timestamp:

2015-05-16T00:49:42+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11290 - fix width of auto_increment buttons for Aqua & Nimbus look and feels

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java

@@ -10 +10 @@
 import java.awt.GridBagLayout;
 import java.awt.GridLayout;
+import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -34 +35 @@
 import java.util.TreeSet;
 
+import javax.swing.AbstractButton;
+import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
 import javax.swing.Icon;
@@ -695 +698 @@
                     aibutton.setMargin(new java.awt.Insets(0,0,0,0));
                     aibutton.setFocusable(false);
+                    saveHorizontalSpace(aibutton);
                     bg.add(aibutton);
                     try {
@@ -731 +735 @@
                     }
                 });
+                saveHorizontalSpace(releasebutton);
                 pnl.add(releasebutton, GBC.eol());
                 value = pnl;
@@ -737 +742 @@
             p.add(value, GBC.eol().fill(GBC.HORIZONTAL));
             return true;
+        }
+
+        private static void saveHorizontalSpace(AbstractButton button) {
+            Insets insets = button.getBorder().getBorderInsets(button);
+            // Ensure the current look&feel does not waste horizontal space (as seen in Nimbus & Aqua)
+            if (insets != null && insets.left+insets.right > insets.top+insets.bottom) {
+                int min = Math.min(insets.top, insets.bottom);
+                button.setBorder(BorderFactory.createEmptyBorder(insets.top, min, insets.bottom, min));
+            }
         }