Changeset 10356 in josm for trunk/src/org/openstreetmap/josm/gui/SideButton.java

Timestamp:

2016-06-12T00:00:29+02:00 (8 years ago)

Author:

stoecker

Message:

see #9995, see #10684 - remove more hardcoded places of images

File:

• trunk/src/org/openstreetmap/josm/gui/SideButton.java (modified) (7 diffs)

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

@@ -18 +18 @@
 import javax.swing.plaf.basic.BasicArrowButton;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageResource;
 
 /**
@@ -26 +28 @@
  */
 public class SideButton extends JButton implements Destroyable {
-    private static final int iconHeight = ImageProvider.ImageSizes.SIDEBUTTON.getImageSize();
 
     private transient PropertyChangeListener propertyChangeListener;
@@ -33 +34 @@
      * Constructs a new {@code SideButton}.
      * @param action action used to specify the new button
+     * @since 744
      */
     public SideButton(Action action) {
         super(action);
-        fixIcon(action);
+        ImageResource icon = (ImageResource) action.getValue("ImageResource");
+        if (icon != null) {
+            setIcon(icon.getImageIconBounded(
+                ImageProvider.ImageSizes.SIDEBUTTON.getImageDimension()));
+        } else { /* TODO: remove when calling code is fixed */
+            Main.warn("Old style SideButton usage for action " + action);
+            fixIcon(action);
+        }
         doStyle();
     }
@@ -44 +53 @@
      * @param action action used to specify the new button
      * @param usename use action name
+     * @since 2710
      */
     public SideButton(Action action, boolean usename) {
@@ -58 +68 @@
      * @param action action used to specify the new button
      * @param imagename image name in "dialogs" directory
+     * @since 2747
      */
     public SideButton(Action action, String imagename) {
         super(action);
-        setIcon(getScaledImage(ImageProvider.get("dialogs", imagename).getImage()));
+        ImageProvider prov = new ImageProvider("dialogs", imagename);
+        setIcon(prov.setSize(ImageProvider.ImageSizes.SIDEBUTTON).get());
         doStyle();
     }
 
+    @Deprecated
     private void fixIcon(Action action) {
         // need to listen for changes, so that putValue() that are called after the
@@ -79 +92 @@
             action.addPropertyChangeListener(propertyChangeListener);
         }
+        int iconHeight = ImageProvider.ImageSizes.SIDEBUTTON.getImageSize();
         Icon i = getIcon();
         if (i instanceof ImageIcon && i.getIconHeight() != iconHeight) {
-            setIcon(getScaledImage(((ImageIcon) i).getImage()));
+            Image im = ((ImageIcon) i).getImage();
+            int newWidth = im.getWidth(null) *  iconHeight / im.getHeight(null);
+            ImageIcon icon = new ImageIcon(im.getScaledInstance(newWidth, iconHeight, Image.SCALE_SMOOTH));
+            setIcon(icon);
         }
     }
 
     /**
-     * Scales the given image proportionally so that the height is "iconHeight"
-     * @param im original image
-     * @return scaled image
+     * Do the style settings for the side button layout
      */
-    private static ImageIcon getScaledImage(Image im) {
-        int newWidth = im.getWidth(null) *  iconHeight / im.getHeight(null);
-        return new ImageIcon(im.getScaledInstance(newWidth, iconHeight, Image.SCALE_SMOOTH));
-    }
-
     private void doStyle() {
         setLayout(new BorderLayout());
@@ -101 +111 @@
     }
 
+    /**
+     * Create the arrow for opening a drop-down menu
+     * @param listener listener to use for button actions (e.g. pressing)
+     * @return the created button
+     * @since 9668
+     */
     public BasicArrowButton createArrow(ActionListener listener) {
         setMargin(new Insets(0, 0, 0, 0));