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

Timestamp:

2020-06-21T18:53:41+02:00 (4 years ago)

Author:

simon04

Message:

fix #18213 - MapCSS: add support for repeat-image-opacity

File:

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

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

@@ -6 +6 @@
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Composite;
 import java.awt.Dimension;
 import java.awt.Font;
@@ -682 +683 @@
      * @param spacing spacing between two images
      * @param phase initial spacing
+     * @param opacity the opacity
      * @param align alignment of the image. The top, center or bottom edge can be aligned with the way.
      */
     public void drawRepeatImage(IWay<?> way, MapImage pattern, boolean disabled, double offset, double spacing, double phase,
-            LineImageAlignment align) {
+                                float opacity, LineImageAlignment align) {
         final int imgWidth = pattern.getWidth();
         final double repeat = imgWidth + spacing;
@@ -730 +732 @@
                 int sx1 = Math.max(0, -x);
                 int sx2 = imgWidth - Math.max(0, x + imgWidth - (int) Math.ceil(segmentLength));
+                Composite saveComposite = g.getComposite();
+                g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, opacity));
                 g.drawImage(image, x + sx1, dy1, x + sx2, dy2, sx1, 0, sx2, imgHeight, null);
+                g.setComposite(saveComposite);
                 imageStart += repeat;
             }