Changeset 19657 in josm for trunk/test

Timestamp:

2026-10-23T16:00:18+02:00 (5 days 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/test/unit/org/openstreetmap/josm

Files:

• gui/tagging/presets/items/ComboTest.java (modified) (3 diffs)
• tools/ImageResizeModeTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/tagging/presets/items/ComboTest.java

@@ -7 +7 @@
 import java.awt.Color;
 
+import javax.swing.JLabel;
+import javax.swing.JList;
 import javax.swing.JPanel;
 
@@ -17 +19 @@
 import org.openstreetmap.josm.testutils.annotations.I18n;
 import org.openstreetmap.josm.testutils.annotations.Main;
+import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 
 /**
@@ -124 +127 @@
     }
 
+    /**
+     * Entry icons are centered in a square and entries without an icon get a blank one, so that the texts line up.
+     */
+    @Test
+    void testIconAlignment() {
+        final Combo combo = getInstance();
+        combo.key = "highway";
+        PresetListEntry trunk = new PresetListEntry("trunk", combo);
+        trunk.icon = "presets/transport/way/way_trunk.svg";
+        combo.addListEntry(trunk);
+        combo.addListEntry(new PresetListEntry("busway", combo));
+        combo.addToPanel(new JPanel(), TaggingPresetItemGuiSupport.create(false));
+        JList<PresetListEntry> list = new JList<>();
+        for (PresetListEntry entry : combo.presetListEntries) {
+            JLabel label = (JLabel) combo.combobox.getRenderer().getListCellRendererComponent(list, entry, 0, false, false);
+            assertEquals(ImageSizes.SMALLICON.getAdjustedWidth(), label.getIcon().getIconWidth(), entry.value);
+            assertEquals(ImageSizes.SMALLICON.getAdjustedHeight(), label.getIcon().getIconHeight(), entry.value);
+        }
+    }
+
     @Test
     void testColor() {

trunk/test/unit/org/openstreetmap/josm/tools/ImageResizeModeTest.java

@@ -7 +7 @@
 
 import java.awt.Dimension;
+import java.awt.image.BufferedImage;
 
 import org.junit.jupiter.api.Test;
@@ -69 +70 @@
 
     /**
+     * Test method for {@link ImageResizeMode#createBufferedImage} using {@link ImageResizeMode#PADDED} on a raster image
+     */
+    @Test
+    void testCreateBufferedImagePaddedRaster() {
+        BufferedImage source = new BufferedImage(16, 4, BufferedImage.TYPE_INT_RGB); // opaque black
+        BufferedImage padded = ImageResizeMode.PADDED.createBufferedImage(new Dimension(32, 32), new Dimension(16, 4), null, source);
+        assertEquals(32, padded.getWidth());
+        assertEquals(32, padded.getHeight());
+        // aspect ratio is kept: a 32x8 bar centered vertically
+        assertEquals(0, padded.getRGB(16, 11) >>> 24);
+        assertEquals(0xff, padded.getRGB(16, 12) >>> 24);
+        assertEquals(0xff, padded.getRGB(16, 19) >>> 24);
+        assertEquals(0, padded.getRGB(16, 20) >>> 24);
+    }
+
+    /**
      * Test method for {@link ImageResizeMode#cacheKey}
      */