Changeset 8111 in josm for trunk

Timestamp:

2015-03-03T22:20:57+01:00 (9 years ago)

Author:

bastiK

Message:

fixed #11194 - Bangla script not rendered correctly on main map area

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

@@ -26 +26 @@
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
+import java.text.Bidi;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -1204 +1205 @@
 
         FontRenderContext frc = g.getFontRenderContext();
-        GlyphVector gv = text.font.createGlyphVector(frc, name);
+        char[] chars = name.toCharArray();
+        int dirFlag = Bidi.DIRECTION_LEFT_TO_RIGHT;
+        if (Bidi.requiresBidi(chars, 0, chars.length)) {
+            Bidi bd = new Bidi(name, Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT);
+            if (bd.isRightToLeft()) {
+                dirFlag = Bidi.DIRECTION_RIGHT_TO_LEFT;
+            }
+        }
+        // only works for text that is completely left-to-right or completely
+        // right-to-left, not bi-directional text
+        GlyphVector gv = text.font.layoutGlyphVector(frc, chars, 0, chars.length, dirFlag);
 
         for (int i=0; i<gv.getNumGlyphs(); ++i) {