Changeset 7136 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java

Timestamp:

2014-05-17T23:52:55+02:00 (10 years ago)

Author:

bastiK

Message:

mapcss: add support for alpha info in color property, e.g.
color: #aa0022ee; or color: rgba(1.0, 0.2, 0.8, 0.8);
*opacity properties still have higher priority, if specified
explicitly

File:

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

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

@@ -216 +216 @@
         Stroke stroke = null;
         if (strokeColor != null) {
-            float strokeAlpha = c.get("symbol-stroke-opacity", 1f, Float.class);
-            strokeColor = new Color(strokeColor.getRed(), strokeColor.getGreen(),
-                    strokeColor.getBlue(), Utils.color_float2int(strokeAlpha));
+            Integer strokeAlpha = Utils.color_float2int(c.get("symbol-stroke-opacity", null, Float.class));
+            if (strokeAlpha != null) {
+                strokeColor = new Color(strokeColor.getRed(), strokeColor.getGreen(),
+                        strokeColor.getBlue(), strokeAlpha);
+            }
             stroke = new BasicStroke(strokeWidth);
         }
@@ -228 +230 @@
 
         if (fillColor != null) {
-            float fillAlpha = c.get("symbol-fill-opacity", 1f, Float.class);
-            fillColor = new Color(fillColor.getRed(), fillColor.getGreen(),
-                    fillColor.getBlue(), Utils.color_float2int(fillAlpha));
+            Integer fillAlpha = Utils.color_float2int(c.get("symbol-fill-opacity", null, Float.class));
+            if (fillAlpha != null) {
+                fillColor = new Color(fillColor.getRed(), fillColor.getGreen(),
+                        fillColor.getBlue(), fillAlpha);
+            }
         }