xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Canvas fillColor: use common defaults, closes #314

Browse Source
This commit is contained in:
Emux 2017-03-02 14:56:45 +02:00
parent 759915861e
commit ea402f77f1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vtm-android/src/org/oscim/android/canvas/AndroidCanvas.java
View File

@ -18,6 +18,7 @@
*/ */
package org.oscim.android.canvas; package org.oscim.android.canvas;
import android.graphics.Color;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import org.oscim.backend.canvas.Bitmap; import org.oscim.backend.canvas.Bitmap;
@ -74,7 +75,7 @@ public class AndroidCanvas implements Canvas {
@Override @Override
public void fillColor(int color) { public void fillColor(int color) {
canvas.drawColor(color, PorterDuff.Mode.CLEAR); canvas.drawColor(color, color == Color.TRANSPARENT ? PorterDuff.Mode.CLEAR : PorterDuff.Mode.SRC_OVER);
} }
@Override @Override

2
vtm-desktop/src/org/oscim/awt/AwtCanvas.java
View File

@ -162,7 +162,7 @@ public class AwtCanvas implements Canvas {
public void fillColor(int color) { public void fillColor(int color) {
java.awt.Color awtColor = color == Color.TRANSPARENT ? TRANSPARENT : new java.awt.Color(color); java.awt.Color awtColor = color == Color.TRANSPARENT ? TRANSPARENT : new java.awt.Color(color);
Composite originalComposite = this.canvas.getComposite(); Composite originalComposite = this.canvas.getComposite();
this.canvas.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC)); this.canvas.setComposite(AlphaComposite.getInstance(color == Color.TRANSPARENT ? AlphaComposite.CLEAR : AlphaComposite.SRC_OVER));
this.canvas.setColor(awtColor); this.canvas.setColor(awtColor);
this.canvas.fillRect(0, 0, getWidth(), getHeight()); this.canvas.fillRect(0, 0, getWidth(), getHeight());
this.canvas.setComposite(originalComposite); this.canvas.setComposite(originalComposite);