Changeset 3858 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java

Timestamp:

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

Author:

bastiK

Message:

mapcss: support for opacity & icon-image

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java

@@ -60 +60 @@
             color = PaintColors.UNTAGGED.get();
         }
+
+        int alpha = 255;
+        Integer pAlpha = color_float2int(c.get("opacity", null, float.class));
+        if (pAlpha != null) {
+            alpha = pAlpha;
+        }
+        color = new Color(color.getRed(), color.getGreen(), color.getBlue(), alpha);
+
         float[] dashes = c.get(prefix + "dashes", null, float[].class);
         if (dashes != null) {
@@ -124 +132 @@
             markColor = paintSettings.getHighlightColor();
         } else if (selected) {
-            markColor = paintSettings.getSelectedColor();
+            markColor = paintSettings.getSelectedColor(color.getAlpha());
         } else if (member) {
-            markColor = paintSettings.getRelationSelectedColor();
+            markColor = paintSettings.getRelationSelectedColor(color.getAlpha());
         } else if(w.isDisabled()) {
             markColor = paintSettings.getInactiveColor();