Changeset 17866 in josm for trunk

Timestamp:

2021-05-06T18:08:22+02:00 (3 years ago)

Author:

simon04

Message:

fix #20706 - Enable text antialiasing for more systems (patch by nvarner and DevCharly)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (3 diffs)
• widgets/JosmEditorPane.java (modified) (2 diffs)

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

@@ -13 +13 @@
 import java.awt.GraphicsEnvironment;
 import java.awt.GridBagLayout;
+import java.awt.RenderingHints;
 import java.awt.Toolkit;
 import java.io.File;
@@ -1164 +1165 @@
                 "List.font");
         // "Table.font" see org.openstreetmap.josm.gui.util.TableHelper.setFont
+
+        setupTextAntiAliasing();
     }
 
@@ -1176 +1179 @@
                 UIManager.put(key, new FontUIResource(font));
             }
+        }
+    }
+
+    private static void setupTextAntiAliasing() {
+        // On Linux and running on Java 9+, enable text anti aliasing
+        // if not yet enabled and if neither running on Gnome or KDE desktop
+        if (PlatformManager.isPlatformUnixoid()
+                && Utils.getJavaVersion() >= 9
+                && UIManager.getLookAndFeelDefaults().get(RenderingHints.KEY_TEXT_ANTIALIASING) == null
+                && System.getProperty("awt.useSystemAAFontSettings") == null
+                && Toolkit.getDefaultToolkit().getDesktopProperty("gnome.Xft/Antialias") == null
+                && Toolkit.getDefaultToolkit().getDesktopProperty("fontconfig/Antialias") == null) {
+            UIManager.getLookAndFeelDefaults().put(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+            UIManager.getLookAndFeelDefaults().put(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         }
     }

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

@@ -4 +4 @@
 import java.awt.Color;
 import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
 import java.io.IOException;
 import java.io.InputStream;
@@ -87 +90 @@
     }
 
+    @Override
+    public void paintComponent(Graphics g) {
+        // Force antialiasing within the JosmEditorPane for antialiased bullet points
+        Graphics2D g2d = (Graphics2D) g.create();
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        super.paintComponent(g2d);
+        g2d.dispose();
+    }
+
     /**
      * Adapts a {@link JEditorPane} to be used as a powerful replacement of {@link javax.swing.JLabel}.