Changeset 7694 in josm for trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

Timestamp:

2014-11-02T11:38:51+01:00 (9 years ago)

Author:

stoecker

Message:

image size fixes

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (3 diffs)

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

@@ -119 +119 @@
         /* MAP icon */
         MAP,
-        /* MAP icon maximum size*/
+        /* MAP icon maximum size */
         MAPMAX,
+        /* MENU icon size */
+        MENU,
     }
 
@@ -254 +256 @@
         case MAP: sizeval = Main.pref.getInteger("iconsize.mapmax", 16); break;
         case LARGEICON: sizeval = Main.pref.getInteger("iconsize.largeicon", 24); break;
+        case MENU: /* MENU is SMALLICON - only provided in case of future changes */ 
         case SMALLICON: sizeval = Main.pref.getInteger("iconsize.smallicon", 16); break;
         default: sizeval = Main.pref.getInteger("iconsize.default", 24); break;
@@ -949 +952 @@
      * @return an icon that represent the overlay of the two given icons. The second icon is layed
      * on the first relative to the given position.
-     */
+     * FIXME: This function does not fit into the ImageProvider concept as public function!
+     * Overlay should be handled like all the other functions only settings arguments and
+     * overlay must be transparent in the background.
+     * Also scaling is not cared about with current implementation.
+     */
+    @Deprecated
     public static ImageIcon overlay(Icon ground, Icon overlay, OverlayPosition pos) {
         int w = ground.getIconWidth();