Changeset 10358 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

Timestamp:

2016-06-12T12:00:38+02:00 (9 years ago)

Author:

stoecker

Message:

see #9995 - improve handling for HIDPI screens, patch by strump (modified by me)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (modified) (1 diff)

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

@@ -510 +510 @@
                     // Get icon
                     String iconName = tps.getIconName();
-                    ImageIcon icon = iconName != null && !iconName.isEmpty() ? ImageProvider.get("preferences", iconName) : null;
-                    // See #6985 - Force icons to be 48x48 pixels
-                    if (icon != null && (icon.getIconHeight() != 48 || icon.getIconWidth() != 48)) {
-                        icon = new ImageIcon(icon.getImage().getScaledInstance(48, 48, Image.SCALE_DEFAULT));
+                    ImageIcon icon = null;
+
+                    if(iconName != null && !iconName.isEmpty()) {
+                        icon = new ImageProvider("preferences", iconName).setSize(ImageProvider.ImageSizes.SETTINGS_TAB).get();
                     }
                     if (settingsInitialized.contains(tps)) {