Changeset 6172 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

Timestamp:

2013-08-21T18:15:12+02:00 (13 years ago)

Author:

Don-vip

Message:

fix #8849:

• Used scaled down (16x16 pixels) of large (.svg) images if no size is explicitely defined
• rendering of emergency=aed with recently added svg
• optimizations/refactoring in icons rotating/rescaling code
• fix of various warnings, javadoc

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -13 +13 @@
 import java.awt.GridBagLayout;
 import java.awt.GridLayout;
-import java.awt.Image;
 import java.awt.Rectangle;
 import java.awt.Toolkit;
@@ -33 +32 @@
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JCheckBoxMenuItem;
@@ -462 +460 @@
 
             // scale down the dialog icon
-            ImageIcon inIcon = ImageProvider.get("dialogs", iconName);
-            ImageIcon smallIcon = new ImageIcon(inIcon.getImage().getScaledInstance(16 , 16, Image.SCALE_SMOOTH));
-            lblTitle = new JLabel("",smallIcon, JLabel.TRAILING);
+            lblTitle = new JLabel("", new ImageProvider("dialogs", iconName).setWidth(16).get(), JLabel.TRAILING);
             lblTitle.setIconTextGap(8);
 
@@ -500 +496 @@
             // show the pref button if applicable
             if (preferenceClass != null) {
-                inIcon = ImageProvider.get("preference");
-                smallIcon = new ImageIcon(inIcon.getImage().getScaledInstance(16 , 16, Image.SCALE_SMOOTH));
-                JButton pref = new JButton(smallIcon);
+                JButton pref = new JButton(new ImageProvider("preference").setWidth(16).get());
                 pref.setToolTipText(tr("Open preferences for this panel"));
                 pref.setBorder(BorderFactory.createEmptyBorder());