Changeset 18099 in josm for trunk

Timestamp:

2021-08-01T19:40:15+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21176 - fix icon sizes of save layers dialog

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/SideButton.java (modified) (1 diff)
• gui/io/SaveLayersDialog.java (modified) (6 diffs)
• gui/tagging/presets/TaggingPreset.java (modified) (1 diff)
• tools/ImageResource.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/SideButton.java

@@ -36 +36 @@
     public SideButton(Action action) {
         super(action);
-        ImageResource icon = (ImageResource) action.getValue("ImageResource");
+        ImageResource icon = ImageResource.getAttachedImageResource(action);
         if (icon != null) {
             setIcon(icon.getImageIconBounded(

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

@@ -12 +12 @@
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
-import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.awt.event.WindowAdapter;
@@ -55 +54 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
+import org.openstreetmap.josm.tools.ImageResource;
 import org.openstreetmap.josm.tools.InputMapUtils;
 import org.openstreetmap.josm.tools.Logging;
@@ -451 +452 @@
 
     final class SaveAndProceedAction extends AbstractAction implements PropertyChangeListener {
-        private static final int ICON_SIZE = 24;
-        private static final String BASE_ICON = "BASE_ICON";
-        private final transient Image save = getImage("save", false);
-        private final transient Image upld = getImage("upload", false);
-        private final transient Image saveDis = getImage("save", true);
-        private final transient Image upldDis = getImage("upload", true);
+
+        private ImageResource actionImg = null;
 
         SaveAndProceedAction() {
@@ -462 +459 @@
         }
 
-        Image getImage(String name, boolean disabled) {
-            ImageIcon img = new ImageProvider(name).setDisabled(disabled).setOptional(true).get();
-            return img != null ? img.getImage() : null;
+        ImageResource getImage(String name, boolean disabled) {
+            return new ImageProvider(name).setDisabled(disabled).setOptional(true).getResource();
         }
 
@@ -472 +468 @@
                     putValue(NAME, tr("Perform actions before exiting"));
                     putValue(SHORT_DESCRIPTION, tr("Exit JOSM with saving. Unsaved changes are uploaded and/or saved."));
-                    putValue(BASE_ICON, ImageProvider.getIfAvailable("exit"));
+                    actionImg = new ImageProvider("exit").getResource();
                     break;
                 case RESTART:
                     putValue(NAME, tr("Perform actions before restarting"));
                     putValue(SHORT_DESCRIPTION, tr("Restart JOSM with saving. Unsaved changes are uploaded and/or saved."));
-                    putValue(BASE_ICON, ImageProvider.getIfAvailable("restart"));
+                    actionImg = new ImageProvider("restart").getResource();
                     break;
                 case DELETE:
                     putValue(NAME, tr("Perform actions before deleting"));
                     putValue(SHORT_DESCRIPTION, tr("Save/Upload layers before deleting. Unsaved changes are not lost."));
-                    putValue(BASE_ICON, ImageProvider.getIfAvailable("dialogs", "delete"));
+                    actionImg = new ImageProvider("dialogs", "delete").getResource();
                     break;
             }
@@ -489 +485 @@
 
         public void redrawIcon() {
-            ImageIcon base = ((ImageIcon) getValue(BASE_ICON));
-            BufferedImage newIco = new BufferedImage(ICON_SIZE*3, ICON_SIZE, BufferedImage.TYPE_4BYTE_ABGR);
+            ImageResource uploadImg = model.getLayersToUpload().isEmpty() ? getImage("upload", true) : getImage("upload", false);
+            ImageResource saveImg = model.getLayersToSave().isEmpty() ? getImage("save", true) : getImage("save", false);
+            attachImageIcon(SMALL_ICON, ImageSizes.SMALLICON, uploadImg, saveImg, actionImg);
+            attachImageIcon(LARGE_ICON_KEY, ImageSizes.LARGEICON, uploadImg, saveImg, actionImg);
+        }
+
+        private void attachImageIcon(String key, ImageSizes size, ImageResource uploadImg, ImageResource saveImg, ImageResource actionImg) {
+            Dimension dim = size.getImageDimension();
+            BufferedImage newIco = new BufferedImage((int) dim.getWidth()*3, (int) dim.getHeight(), BufferedImage.TYPE_4BYTE_ABGR);
             Graphics2D g = newIco.createGraphics();
-            // CHECKSTYLE.OFF: SingleSpaceSeparator
-            g.drawImage(model.getLayersToUpload().isEmpty() ? upldDis : upld, ICON_SIZE*0, 0, ICON_SIZE, ICON_SIZE, null);
-            g.drawImage(model.getLayersToSave().isEmpty()   ? saveDis : save, ICON_SIZE*1, 0, ICON_SIZE, ICON_SIZE, null);
-            if (base != null) {
-                g.drawImage(base.getImage(),                                  ICON_SIZE*2, 0, ICON_SIZE, ICON_SIZE, null);
-            }
-            // CHECKSTYLE.ON: SingleSpaceSeparator
-            putValue(SMALL_ICON, new ImageIcon(newIco));
+            drawImageIcon(g, 0, dim, uploadImg);
+            drawImageIcon(g, 1, dim, saveImg);
+            drawImageIcon(g, 2, dim, actionImg);
+            putValue(key, new ImageIcon(newIco));
+        }
+
+        private void drawImageIcon(Graphics2D g, int index, Dimension dim, ImageResource img) {
+            if (img != null) {
+                g.drawImage(img.getImageIcon(dim).getImage(), (int) dim.getWidth()*index, 0, (int) dim.getWidth(), (int) dim.getHeight(), null);
+            }
         }
 

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

@@ -221 +221 @@
     }
 
+    /**
+     * Returns the {@link ImageResource} attached to this preset, if any.
+     * @return the {@code ImageResource} attached to this preset, or {@code null}
+     * @since 16060
+     */
     public final ImageResource getImageResource() {
-        return (ImageResource) getValue("ImageResource");
+        return ImageResource.getAttachedImageResource(this);
     }
 

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

@@ -15 +15 @@
 import javax.swing.JPanel;
 import javax.swing.UIManager;
+
+import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 
 import com.kitfox.svg.SVGDiagram;
@@ -101 +103 @@
      */
     public void attachImageIcon(AbstractAction a) {
-        Dimension iconDimension = ImageProvider.ImageSizes.SMALLICON.getImageDimension();
-        ImageIcon icon = getImageIcon(iconDimension);
-        a.putValue(Action.SMALL_ICON, icon);
-
-        iconDimension = ImageProvider.ImageSizes.LARGEICON.getImageDimension();
-        icon = getImageIcon(iconDimension);
-        a.putValue(Action.LARGE_ICON_KEY, icon);
+        a.putValue(Action.SMALL_ICON, getImageIcon(ImageSizes.SMALLICON.getImageDimension()));
+        a.putValue(Action.LARGE_ICON_KEY, getImageIcon(ImageSizes.LARGEICON.getImageDimension()));
     }
 
@@ -121 +118 @@
             a.putValue("ImageResource", this);
         }
+    }
+
+    /**
+     * Returns the {@code ImageResource} attached to the given action, if any.
+     * @param a action
+     * @return the {@code ImageResource} attached to the given action, or {@code null}
+     * @since 18099
+     */
+    public static ImageResource getAttachedImageResource(Action a) {
+        return (ImageResource) a.getValue("ImageResource");
     }