Combination of Simantics-platform related changes and fixes for district

[simantics/platform.git] / bundles / org.simantics.g2d / src / org / simantics / g2d / image / impl / AWTImage.java

diff --git a/bundles/org.simantics.g2d/src/org/simantics/g2d/image/impl/AWTImage.java b/bundles/org.simantics.g2d/src/org/simantics/g2d/image/impl/AWTImage.java
index e547a663e8e8844024f110485ee85ba81d7ee302..0fbe895be551d6a75650db1decf5f5651ad56db1 100644 (file)
--- a/bundles/org.simantics.g2d/src/org/simantics/g2d/image/impl/AWTImage.java
+++ b/bundles/org.simantics.g2d/src/org/simantics/g2d/image/impl/AWTImage.java
@@ -34,13 +34,19 @@ public class AWTImage extends AbstractImage implements Image {
 
     BufferedImage bi;
     Rectangle2D rect;
+    float alpha;
 
-    public AWTImage(BufferedImage bi) {
+    public AWTImage(BufferedImage bi, float alpha) {
         assert(bi!=null);
         this.bi = bi;
+        this.alpha = alpha;
         rect = new Rectangle2D.Double(bi.getMinX(),bi.getMinY(),bi.getWidth(), bi.getHeight());
     }
 
+    public AWTImage(BufferedImage bi) {
+        this(bi, 1.0f);
+    }
+
     @Override
     public Rectangle2D getBounds() {
         return rect;
@@ -55,6 +61,8 @@ public class AWTImage extends AbstractImage implements Image {
     public Node init(G2DParentNode parent) {
         ImageNode node = parent.getOrCreateNode("image", ImageNode.class);
         node.setImage(bi);
+        node.setAlpha(alpha);
+        node.setZIndex(-100);
         return node;
     }