g.setColor(4-byte rgb+alpha)

hansonr · hansonr · commit 1661a3e91498 · 2019-07-27T16:53:10.000+01:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSGraphics2D.java b/sources/net.sf.j2s.java.core/src/swingjs/JSGraphics2D.java
@@ -784,9 +784,13 @@ public boolean hitClip(int x, int y, int width, int height) {
 		return clipRect.intersects(x, y, width, height);
 	}
 
+	private int alpha;
 	private void setGraphicsColor(Color c) {
 		if (c == null)
 			return; // this was the case with a JRootPanel graphic call
+		int a = c.getAlpha();
+		if (a != alpha)
+			ctx.globalAlpha = (alpha = a) / 256F;
 		ctx.fillStyle = ctx.strokeStyle = JSToolkit.getCSSColor(c);
 	}
 
@@ -1004,13 +1008,8 @@ public void drawImage(BufferedImage img, BufferedImageOp op, int x, int y) {
 	}
 
 	public void setAlpha(float f) {
-		/**
-		 * @j2sNative
-		 *
-		 * 			this.ctx.globalAlpha = f;
-		 */
-		{
-		}
+		ctx.globalAlpha = f;
+		alpha = (int) Math.floor(f * 256 + 0.0039);
 	}
 
 	public HTML5Canvas getCanvas() {
@@ -1050,17 +1049,7 @@ public int mark() {
 		// note: This method is referred to in JComponent.java j2snative block as mark$
 		ctx.save();
 		Object[] map = new Object[SAVE_MAX];
-
-		float alpha = 0;
-		/**
-		 * @j2sNative
-		 * 
-		 * 			alpha = this.ctx.globalAlpha;
-		 * 
-		 */
-		{
-		}
-		map[SAVE_ALPHA] = Float.valueOf(alpha);
+		map[SAVE_ALPHA] = Float.valueOf(ctx.globalAlpha);
 		map[SAVE_COMPOSITE] = alphaComposite;
 		map[SAVE_STROKE] = currentStroke;
 		map[SAVE_TRANSFORM] = transform;
@@ -1083,8 +1072,9 @@ public void reset(int n0) {
 			Object[] map = HTML5CanvasContext2D.pop(ctx);
 			setComposite((Composite) map[SAVE_COMPOSITE]);
 			Float alpha = (Float) map[SAVE_ALPHA];
-			if (alpha != null)
+			if (alpha != null) {
 				setAlpha(alpha.floatValue());
+			}
 			setStroke((Stroke) map[SAVE_STROKE]);
 			setTransform((AffineTransform) map[SAVE_TRANSFORM]);
 			setFont((Font) map[SAVE_FONT]);
