Changeset 3858 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2011-02-05T18:28:47+01:00 (13 years ago)

Author:

bastiK

Message:

mapcss: support for opacity & icon-image

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Files:

• MapPaintSettings.java (modified) (1 diff)
• MapPainter.java (modified) (1 diff)

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

@@ -108 +108 @@
     }
 
+    public Color getSelectedColor(int alpha) {
+        return new Color(selectedColor.getRGB() & 0x00ffffff | (alpha << 24), true);
+    }
+
     public Color getRelationSelectedColor() {
         return relationSelectedColor;
     }
 
+    public Color getRelationSelectedColor(int alpha) {
+        return new Color(relationSelectedColor.getRGB() & 0x00ffffff | (alpha << 24), true);
+    }
+
     public Color getHighlightColor() {
         return highlightColor;

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

@@ -277 +277 @@
     protected void drawArea(Polygon polygon, Color color, String name) {
 
-        /* set the opacity (alpha) level of the filled polygon */
-        g.setColor(new Color(color.getRed(), color.getGreen(), color.getBlue(), fillAlpha));
+        g.setColor(color);
 
         if (outlineOnly) {