Changeset 19657 in josm for trunk/src

Timestamp:

2026-10-23T16:00:18+02:00 (2 weeks ago)

Author:

gaben

Message:

fix #21208, fix #21207 - center icons and align text in preference and preset lists

Use padded icons for tagging preset icons and for list entry/label icons in the preset dialog, so non-square icons are centered and the texts line up. List entries without an icon get a blank one if other entries of the list have an icon.

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/SourceEditor.java (modified) (1 diff)
• gui/tagging/presets/TaggingPreset.java (modified) (1 diff)
• gui/tagging/presets/TaggingPresetItem.java (modified) (3 diffs)
• gui/tagging/presets/items/ComboMultiSelect.java (modified) (3 diffs)
• tools/ImageResizeMode.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -1337 +1337 @@
                 }
                 final ImageSizes size = ImageSizes.TABLE;
-                setIcon(value.icon == null ? ImageProvider.getEmpty(size) : value.icon.getImageIconBounded(size.getImageDimension()));
+                setIcon(value.icon == null ? ImageProvider.getEmpty(size) : value.icon.getPaddedIcon(size.getImageDimension()));
             }
             return this;

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -291 +291 @@
                 if (result != null) {
                     // Pre-render off EDT to avoid flooding the event queue with expensive SVG rendering
-                    ImageIcon small = result.getImageIcon(ImageProvider.ImageSizes.SMALLICON.getImageDimension());
-                    ImageIcon large = result.getImageIcon(ImageProvider.ImageSizes.LARGEICON.getImageDimension());
+                    ImageIcon small = result.getPaddedIcon(ImageProvider.ImageSizes.SMALLICON.getImageDimension());
+                    ImageIcon large = result.getPaddedIcon(ImageProvider.ImageSizes.LARGEICON.getImageDimension());
                     GuiHelper.runInEDT(() -> {
                         try {

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.trc;
 
+import java.awt.Dimension;
 import java.io.File;
 import java.util.Arrays;
@@ -29 +30 @@
 import org.openstreetmap.josm.gui.util.LruCache;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
+import org.openstreetmap.josm.tools.ImageResource;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
@@ -151 +154 @@
      * @param iconName the icon name
      * @param zipIcons zip file where the image is located
-     * @param maxSize maximum image size (or null)
-     * @return the requested image or null if the request failed
+     * @param maxSize maximum image size (or null for the default small icon size)
+     * @return the requested image, centered in a square of {@code maxSize}, or null if the request failed
      */
     public static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) {
         final Collection<String> s = TaggingPresets.ICON_SOURCES.get();
-        ImageProvider imgProv = new ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true);
-        if (maxSize != null && maxSize > 0) {
-            imgProv.setMaxSize(maxSize);
-        }
-        return imgProv.get();
+        final int size = (maxSize != null && maxSize > 0) ? maxSize : ImageSizes.SMALLICON.getVirtualWidth();
+        ImageResource resource = new ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true)
+                .getResource();
+        return resource == null ? null : resource.getPaddedIcon(new Dimension(size, size));
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java

@@ -6 +6 @@
 import java.awt.Component;
 import java.awt.Font;
+import java.awt.image.BufferedImage;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -14 +15 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JList;
@@ -143 +147 @@
                 l.setFont(l.getFont().deriveFont(Font.ITALIC + Font.BOLD));
             }
-            l.setIcon(value.getIcon());
+            Icon icon = value.getIcon();
+            if (icon == null && value.cms != null) {
+                // use a blank icon if other entries have one, so that all texts line up
+                icon = value.cms.presetListEntries.stream().map(PresetListEntry::getIcon).filter(Objects::nonNull).findFirst()
+                        .map(i -> new ImageIcon(new BufferedImage(i.getIconWidth(), i.getIconHeight(), BufferedImage.TYPE_INT_ARGB)))
+                        .orElse(null);
+            }
+            l.setIcon(icon);
             l.setToolTipText(value.getToolTipText(key));
             return l;

trunk/src/org/openstreetmap/josm/tools/ImageResizeMode.java

@@ -95 +95 @@
             renderer.accept(g);
         } else if (sourceIcon != null) {
-            sourceIcon = sourceIcon.getScaledInstance(real.width, real.height, Image.SCALE_SMOOTH);
-            g.drawImage(sourceIcon, 0, 0, null);
+            final Dimension scaled = (this == PADDED) ? AUTO.computeDimension(real, icon) : real;
+            sourceIcon = sourceIcon.getScaledInstance(scaled.width, scaled.height, Image.SCALE_SMOOTH);
+            g.drawImage(sourceIcon, (real.width - scaled.width) / 2, (real.height - scaled.height) / 2, null);
         } else {
             throw new IllegalArgumentException("renderer or sourceIcon");