Changeset 8323 in josm for trunk/src/org/openstreetmap/josm/gui/util

Timestamp:

2015-05-04T20:19:32+02:00 (9 years ago)

Author:

stoecker

Message:

see #10684 - remove remaining overlay() calls

File:

• trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java

@@ -47 +47 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.ImageOverlay;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 import org.openstreetmap.josm.tools.LanguageInfo;
 
@@ -156 +158 @@
         dlg.setContent(content);
         dlg.setButtonIcons(new Icon[] {
-                ImageProvider.get("cancel"),
-                ImageProvider.overlay(
-                        ImageProvider.get("upload"),
-                        new ImageIcon(ImageProvider.get("warning-small").getImage().getScaledInstance(10 , 10, Image.SCALE_SMOOTH)),
-                        ImageProvider.OverlayPosition.SOUTHEAST)});
+                    new ImageProvider("cancel").setMaxSize(ImageSizes.LARGEICON).get(),
+                    new ImageProvider("upload").setMaxSize(ImageSizes.LARGEICON).addOverlay(
+                            new ImageOverlay(new ImageProvider("warning-small"), 0.5,0.5,1.0,1.0)).get()});
         dlg.setToolTipTexts(new String[] {
                 tr("Cancel"),