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

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)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• SideButton.java (modified) (1 diff)
• SplashScreen.java (modified) (3 diffs)
• dialogs/ToggleDialog.java (modified) (3 diffs)
• mappaint/MapPaintStyles.java (modified) (1 diff)
• preferences/PreferenceTabbedPane.java (modified) (1 diff)
• util/GuiSizesHelper.java (added)
• widgets/TextContextualPopupMenu.java (modified) (1 diff)

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

@@ -92 +92 @@
             action.addPropertyChangeListener(propertyChangeListener);
         }
-        int iconHeight = ImageProvider.ImageSizes.SIDEBUTTON.getImageSize();
+        int iconHeight = ImageProvider.ImageSizes.SIDEBUTTON.getImageDimension().height;
         Icon i = getIcon();
         if (i instanceof ImageIcon && i.getIconHeight() != iconHeight) {

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

@@ -9 +9 @@
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
-import java.awt.Image;
 import java.awt.Insets;
 import java.awt.event.MouseAdapter;
@@ -18 +17 @@
 
 import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -70 +68 @@
 
         // Add the logo
-        JLabel logo = new JLabel(new ImageIcon(ImageProvider.get("logo.svg").getImage().getScaledInstance(128, 129, Image.SCALE_SMOOTH)));
+        JLabel logo = new JLabel(new ImageProvider("logo.svg").setSize(ImageProvider.ImageSizes.SPLASH_LOGO).get());
         GridBagConstraints gbc = new GridBagConstraints();
         gbc.gridheight = 2;

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

@@ -34 +34 @@
 import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JCheckBoxMenuItem;
@@ -506 +507 @@
 
             // scale down the dialog icon
-            lblTitle = new JLabel("", new ImageProvider("dialogs", iconName).setWidth(16).get(), JLabel.TRAILING);
+            ImageIcon icon = new ImageProvider("dialogs", iconName).setSize(ImageProvider.ImageSizes.SMALLICON).get();
+            lblTitle = new JLabel("", icon, JLabel.TRAILING);
             lblTitle.setIconTextGap(8);
 
@@ -543 +545 @@
             // show the pref button if applicable
             if (preferenceClass != null) {
-                JButton pref = new JButton(new ImageProvider("preference").setWidth(16).get());
+                JButton pref = new JButton(new ImageProvider("preference").setSize(ImageProvider.ImageSizes.SMALLICON).get());
                 pref.setToolTipText(tr("Open preferences for this panel"));
                 pref.setBorder(BorderFactory.createEmptyBorder());

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -147 +147 @@
     public static ImageIcon getIcon(IconReference ref, int width, int height) {
         final String namespace = ref.source.getPrefName();
-        ImageIcon i = getIconProvider(ref, false).setWidth(width).setHeight(height).get();
+        ImageIcon i = getIconProvider(ref, false).setSize(width, height).get();
         if (i == null) {
             Main.warn("Mappaint style \""+namespace+"\" ("+ref.source.getDisplayString()+") icon \"" + ref.iconName + "\" not found.");

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)) {

trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java

@@ -180 +180 @@
             mi.setText(label);
             if (iconName != null && Main.pref.getBoolean("text.popupmenu.useicons", true)) {
-                ImageIcon icon = new ImageProvider(iconName).setWidth(16).get();
+                ImageIcon icon = new ImageProvider(iconName).setSize(ImageProvider.ImageSizes.SMALLICON).get();
                 if (icon != null) {
                     mi.setIcon(icon);