Changeset 5376 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2012-07-28T15:59:38+02:00 (12 years ago)

Author:

Don-vip

Message:

see #7907 - MapCSS fixes

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• AreaElemStyle.java (modified) (2 diffs)
• StyleKeys.java (modified) (1 diff)

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

@@ -49 +49 @@
 
             fillImage.alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fill-image-alpha", 255))));
-            Integer pAlpha = Utils.color_float2int(c.get("fill-opacity", null, float.class));
+            Integer pAlpha = Utils.color_float2int(c.get(FILL_OPACITY, null, float.class));
             if (pAlpha != null) {
                 fillImage.alpha = pAlpha;
@@ -57 +57 @@
             if (color != null) {
                 int alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fillalpha", 50))));
-                Integer pAlpha = Utils.color_float2int(c.get("fill-opacity", null, float.class));
+                Integer pAlpha = Utils.color_float2int(c.get(FILL_OPACITY, null, float.class));
                 if (pAlpha != null) {
                     alpha = pAlpha;

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

@@ -11 +11 @@
     public static final String FILL_COLOR = "fill-color";
     public static final String FILL_IMAGE = "fill-image";
+    public static final String FILL_OPACITY = "fill-opacity";
     public static final String ICON_IMAGE = "icon-image";
     public static final String MODIFIER = "modifier";