Changeset 8110 in josm

Timestamp:

2015-03-03T16:29:28+01:00 (9 years ago)

Author:

bastiK

Message:

see #11194 - fix rendering of Bangla script (among others) when there is a halo

Text along the line still broken

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -20 +20 @@
 import java.awt.font.GlyphVector;
 import java.awt.font.LineMetrics;
+import java.awt.font.TextLayout;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.GeneralPath;
@@ -408 +409 @@
             g.setStroke(new BasicStroke(2*text.haloRadius, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND));
             g.setColor(text.haloColor);
+            Shape textOutline;
             if (gv == null) {
                 FontRenderContext frc = g.getFontRenderContext();
-                gv = text.font.createGlyphVector(frc, s);
-            }
-            Shape textOutline = gv.getOutline(x, y);
+                TextLayout tl = new TextLayout(s, text.font, frc);
+                textOutline = tl.getOutline(AffineTransform.getTranslateInstance(x, y));
+            } else {
+                textOutline = gv.getOutline(x, y);
+            }
             g.draw(textOutline);
             g.setStroke(new BasicStroke());