Changeset 3979 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java

Timestamp:

2011-03-12T10:27:24+01:00 (13 years ago)

Author:

bastiK

Message:

mapcss: add text-halo-radius

File:

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

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

@@ -12 +12 @@
 import java.awt.Polygon;
 import java.awt.Rectangle;
+import java.awt.Shape;
 import java.awt.TexturePaint;
 import java.awt.font.FontRenderContext;
@@ -315 +316 @@
             gv.setGlyphTransform(i, trfm);
         }
-        g.setColor(text.color);
-        g.drawGlyphVector(gv, 0, 0);
-
+        if (text.haloRadius != null) {
+            Shape textOutline = gv.getOutline();
+            g.setStroke(new BasicStroke(2*text.haloRadius, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND));
+            g.setColor(text.haloColor);
+            g.draw(textOutline);
+            g.setStroke(new BasicStroke());
+            g.setColor(text.color);
+            g.fill(textOutline);
+        } else {
+            g.setColor(text.color);
+            g.drawGlyphVector(gv, 0, 0);
+        }
     }
 
@@ -489 +499 @@
             return;
 
-        if (inactive || n.isDisabled()) {
-            g.setColor(inactiveColor);
-        } else {
-            g.setColor(text.color);
-        }
         Font defaultFont = g.getFont();
         g.setFont(text.font);
@@ -538 +543 @@
             } else throw new AssertionError();
         }
-        g.drawString(s, x, y);
+        if (inactive || n.isDisabled()) {
+            g.setColor(inactiveColor);
+        } else {
+            g.setColor(text.color);
+        }
+        if (text.haloRadius != null) {
+            g.setStroke(new BasicStroke(2*text.haloRadius, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND));
+            g.setColor(text.haloColor);
+            FontRenderContext frc = g.getFontRenderContext();
+            GlyphVector gv = text.font.createGlyphVector(frc, s);
+            Shape textOutline = gv.getOutline(x, y);
+            g.draw(textOutline);
+            g.setStroke(new BasicStroke());
+            g.setColor(text.color);
+            g.fill(textOutline);
+        } else {
+            g.drawString(s, x, y);
+        }
         g.setFont(defaultFont);
     }