Changeset 13843 in josm for trunk/src

Timestamp:

2018-05-26T17:24:23+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16319 - scale bookmark and toolbar icons properly

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/RestartAction.java (modified) (1 diff)
• gui/download/BookmarkList.java (modified) (2 diffs)
• gui/layer/geoimage/GeoImageLayer.java (modified) (1 diff)
• gui/preferences/ToolbarPreferences.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/RestartAction.java

@@ -206 +206 @@
         return new ButtonSpec(
                 tr("Restart"),
-                new ImageProvider("restart").setSize(ImageSizes.LARGEICON).get(),
+                ImageProvider.get("restart", ImageSizes.LARGEICON),
                 tr("Restart the application."),
                 ht("/Action/Restart"),

trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java

@@ -74 +74 @@
             if (array.size() < 5)
                 throw new IllegalArgumentException(tr("Wrong number of arguments for bookmark"));
-            icon = ImageProvider.get("dialogs", "bookmark");
+            icon = getDefaultIcon();
             name = array.get(0);
             area = new Bounds(Double.parseDouble(array.get(1)), Double.parseDouble(array.get(2)),
@@ -102 +102 @@
          */
         protected Bookmark(String name, Bounds area) {
-            this.icon = ImageProvider.get("dialogs", "bookmark");
+            this.icon = getDefaultIcon();
             this.name = name;
             this.area = area;
+        }
+
+        static ImageIcon getDefaultIcon() {
+            return ImageProvider.get("dialogs", "bookmark", ImageSizes.SMALLICON);
         }
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -319 +319 @@
     @Override
     public Icon getIcon() {
-        return new ImageProvider("dialogs/geoimage").setSize(ImageProvider.ImageSizes.LAYER).get();
+        return ImageProvider.get("dialogs/geoimage", ImageProvider.ImageSizes.LAYER);
     }
 

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

@@ -75 +75 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -792 +793 @@
             JButton b = new JButton();
             if ("up".equals(name)) {
-                b.setIcon(ImageProvider.get("dialogs", "up"));
+                b.setIcon(ImageProvider.get("dialogs", "up", ImageSizes.SMALLICON));
             } else if ("down".equals(name)) {
-                b.setIcon(ImageProvider.get("dialogs", "down"));
+                b.setIcon(ImageProvider.get("dialogs", "down", ImageSizes.SMALLICON));
             } else {
                 b.setText(name);