atl/android_translation_layer
0
0
Fork 0
mirror of https://gitlab.com/android_translation_layer/android_translation_layer.git synced 2025-10-27 11:48:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

implement Paint as combination of GDK, GSK and Pango attributes

Browse Source
This commit is contained in:
Julian Winkler
2024-12-21 14:24:33 +01:00
parent ba302d87ec
commit 7695aadf91
9 changed files with 350 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api-impl/android/graphics/Canvas.java
View File

@@ -57,6 +57,10 @@ public class Canvas {
* @param paint The paint used to draw the rect
*/
public void drawRect(float left, float top, float right, float bottom, Paint paint) {
if (paint != null && paint.getXfermode() instanceof PorterDuffXfermode && ((PorterDuffXfermode)paint.getXfermode()).mode == PorterDuff.Mode.CLEAR) {
bitmap.eraseColor(0);
return;
}
gsk_canvas.snapshot = bitmap.getSnapshot();
gsk_canvas.drawRect(left, top, right, bottom, paint);
}

30
src/api-impl/android/graphics/GskCanvas.java
View File

@@ -8,6 +8,8 @@ public class GskCanvas extends Canvas {
public long snapshot;
private int save_count = 0;
private static Paint default_paint = new Paint();
public GskCanvas(long snapshot) {
this.snapshot = snapshot;
}
@@ -43,21 +45,17 @@ public class GskCanvas extends Canvas {
@Override
public void drawBitmap(Bitmap bitmap, Rect src, Rect dst, Paint paint) {
int color = 0;
if (paint != null && paint.colorFilter instanceof PorterDuffColorFilter) {
color = ((PorterDuffColorFilter) paint.colorFilter).getColor();
}
native_drawBitmap(snapshot, bitmap.getTexture(), dst.left, dst.top, dst.width(), dst.height(), color);
native_drawBitmap(snapshot, bitmap.getTexture(), dst.left, dst.top, dst.width(), dst.height(), paint != null ? paint.paint : default_paint.paint);
}
@Override
public void drawPath(Path path, Paint paint) {
native_drawPath(snapshot, path.getGskPath(), paint.getColor(), paint.getStyle().nativeInt);
native_drawPath(snapshot, path.getGskPath(), paint != null ? paint.paint : default_paint.paint);
}
@Override
public void drawRect(float left, float top, float right, float bottom, Paint paint) {
native_drawRect(snapshot, left, top, right, bottom, paint.getColor());
native_drawRect(snapshot, left, top, right, bottom, paint != null ? paint.paint : default_paint.paint);
}
@Override
@@ -69,12 +67,12 @@ public class GskCanvas extends Canvas {
@Override
public void drawText(String text, float x, float y, Paint paint) {
native_drawText(snapshot, text, x, y, paint.getColor(), paint.getTextSize());
native_drawText(snapshot, text, x, y, paint != null ? paint.paint : default_paint.paint);
}
@Override
public void drawLine(float startX, float startY, float stopX, float stopY, Paint paint) {
native_drawLine(snapshot, startX, startY, stopX, stopY, paint.getColor(), paint.getStrokeWidth());
native_drawLine(snapshot, startX, startY, stopX, stopY, paint != null ? paint.paint : default_paint.paint);
}
@Override
@@ -91,7 +89,7 @@ public class GskCanvas extends Canvas {
@Override
public void drawRoundRect(float left, float top, float right, float bottom, float rx, float ry, Paint paint) {
native_drawRoundRect(snapshot, left, top, right, bottom, rx, ry, paint.getColor(), paint.getStrokeWidth(), paint.getStyle().nativeInt);
native_drawRoundRect(snapshot, left, top, right, bottom, rx, ry, paint != null ? paint.paint : default_paint.paint);
}
@Override
@@ -99,15 +97,15 @@ public class GskCanvas extends Canvas {
native_scale(snapshot, sx, sy);
}
protected native void native_drawBitmap(long snapshot, long texture, int x, int y, int width, int height, int color);
protected native void native_drawRect(long snapshot, float left, float top, float right, float bottom, int color);
protected native void native_drawPath(long snapshot, long path, int color, int style);
protected native void native_drawBitmap(long snapshot, long texture, int x, int y, int width, int height, long paint);
protected native void native_drawRect(long snapshot, float left, float top, float right, float bottom, long paint);
protected native void native_drawPath(long snapshot, long path, long paint);
protected native void native_translate(long snapshot, float dx, float dy);
protected native void native_rotate(long snapshot, float degrees);
protected native void native_save(long snapshot);
protected native void native_restore(long snapshot);
protected native void native_drawLine(long snapshot, float startX, float startY, float stopX, float stopY, int color, float strokeWidth);
protected native void native_drawText(long snapshot, String text, float x, float y, int color, float textSize);
protected native void native_drawRoundRect(long snapshot, float left, float top, float right, float bottom, float rx, float ry, int color, float strokeWidth, int style);
protected native void native_drawLine(long snapshot, float startX, float startY, float stopX, float stopY, long paint);
protected native void native_drawText(long snapshot, String text, float x, float y, long paint);
protected native void native_drawRoundRect(long snapshot, float left, float top, float right, float bottom, float rx, float ry, long paint);
protected native void native_scale(long snapshot, float sx, float sy);
}

113
src/api-impl/android/graphics/Paint.java
View File

@@ -17,14 +17,11 @@ public class Paint {
public static final int AUTO_HINTING_TEXT_FLAG = (1 << 11);
public static final int VERTICAL_TEXT_FLAG = (1 << 12);
private Typeface typeface = null;
ColorFilter colorFilter = null;
private int color = 0;
private float strokeWidth = 0;
private float textSize = 7;
private Style style = Style.FILL;
long paint; // native paint
private Xfermode xfermode;
public Paint() {
paint = native_create();
}
public Paint (int flags) {
@@ -33,32 +30,29 @@ public class Paint {
}
public Paint(Paint paint) {
/* TODO: use sk_paint_clone */
this();
setColor(paint.getColor());
this.paint = native_clone(paint.paint);
}
public void setColor(int color) {
this.color = color;
native_set_color(paint, color);
}
public int getColor() {
return color;
return native_get_color(paint);
}
public void setAntiAlias(boolean aa) {
}
public void setStrokeWidth(float width) {
this.strokeWidth = width;
native_set_stroke_width(paint, width);
}
public void setTextSize(float size) {
this.textSize = size;
native_set_text_size(paint, size);
}
public Typeface setTypeface(Typeface typeface) {
this.typeface = typeface;
return this.typeface;
return typeface;
}
public void getTextBounds(String text, int start, int end, Rect bounds) {}
public void getTextBounds(char[] text, int index, int count, Rect bounds) {}
@@ -74,7 +68,7 @@ public class Paint {
}
public void setStyle(Style style) {
this.style = style;
native_set_style(paint, style.ordinal());
}
public float ascent() {
@@ -83,7 +77,7 @@ public class Paint {
public float measureText(char[] text, int index, int count) { return 10; }
public float measureText(String text, int start, int end) {
return (end-start)*textSize;
return (end-start)*getTextSize()*.6f;
}
public float measureText(String text) {
return measureText(text, 0, text.length());
@@ -93,7 +87,12 @@ public class Paint {
}
public ColorFilter setColorFilter(ColorFilter colorFilter) {
this.colorFilter = colorFilter;
if (colorFilter instanceof PorterDuffColorFilter) {
PorterDuffColorFilter porterDuff = (PorterDuffColorFilter)colorFilter;
native_set_color_filter(paint, porterDuff.getMode().ordinal(), porterDuff.getColor());
} else {
native_set_color_filter(paint, -1, 0);
}
return colorFilter;
}
@@ -104,12 +103,12 @@ public class Paint {
* Geometry and text drawn with this style will be filled, ignoring all
* stroke-related settings in the paint.
*/
FILL(0),
FILL,
/**
* Geometry and text drawn with this style will be stroked, respecting
* the stroke-related fields on the paint.
*/
STROKE(1),
STROKE,
/**
* Geometry and text drawn with this style will be both filled and
* stroked at the same time, respecting the stroke-related fields on
@@ -117,12 +116,9 @@ public class Paint {
* is oriented counter-clockwise. This restriction does not apply to
* either FILL or STROKE.
*/
FILL_AND_STROKE(2);
FILL_AND_STROKE;
Style(int nativeInt) {
this.nativeInt = nativeInt;
}
final int nativeInt;
public static final Style values[] = Style.values();
}
public static class FontMetrics {
@@ -180,12 +176,14 @@ public class Paint {
public /*native*/ int getAlpha() { return 0; }
public /*native*/ void setAlpha(int a) {}
public float getStrokeWidth() {
return strokeWidth;
return native_get_stroke_width(paint);
}
public /*native*/ float getStrokeMiter() { return 0; }
public /*native*/ void setStrokeMiter(float miter) {}
public /*native*/ float getTextSize() { return 0; }
public /*native*/ float getTextSize() {
return native_get_text_size(paint);
}
public /*native*/ float getTextScaleX() { return 0; }
public /*native*/ void setTextScaleX(float scaleX) {}
@@ -199,6 +197,11 @@ public class Paint {
public void setShadowLayer(float radius, float dx, float dy, int color) {}
public Xfermode setXfermode(Xfermode xfermode) {
this.xfermode = xfermode;
return xfermode;
}
public Xfermode getXfermode() {
return xfermode;
}
@@ -208,36 +211,36 @@ public class Paint {
/**
* The stroke ends with the path, and does not project beyond it.
*/
BUTT(0),
BUTT,
/**
* The stroke projects out as a semicircle, with the center at the
* end of the path.
*/
ROUND(1),
ROUND,
/**
* The stroke projects out as a square, with the center at the end
* of the path.
*/
SQUARE(2);
SQUARE;
private Cap(int nativeInt) {}
public static final Cap values[] = Cap.values();
}
public enum Join {
/**
* The outer edges of a join meet at a sharp angle
*/
MITER(0),
MITER,
/**
* The outer edges of a join meet in a circular arc.
*/
ROUND(1),
ROUND,
/**
* The outer edges of a join meet with a straight line
*/
BEVEL(2);
BEVEL;
private Join(int nativeInt) {}
public static final Join values[] = Join.values();
}
public enum Align {
@@ -246,9 +249,13 @@ public class Paint {
RIGHT,
}
public void setStrokeCap(Cap cap) {}
public void setStrokeCap(Cap cap) {
native_set_stroke_cap(paint, cap.ordinal());
}
public void setStrokeJoin(Join join) {}
public void setStrokeJoin(Join join) {
native_set_stroke_join(paint, join.ordinal());
}
public Typeface getTypeface() {
return new Typeface();
@@ -284,19 +291,43 @@ public class Paint {
return new FontMetricsInt();
}
public void set(Paint paint) {}
public void set(Paint paint) {
native_recycle(this.paint);
this.paint = native_clone(paint.paint);
}
public boolean isFilterBitmap() { return false; }
public Cap getStrokeCap() { return Cap.BUTT; }
public Cap getStrokeCap() {
return Cap.values[native_get_stroke_cap(paint)];
}
public Join getStrokeJoin() { return Join.MITER; }
public Join getStrokeJoin() {
return Join.values[native_get_stroke_join(paint)];
}
public Locale getTextLocale() { return Locale.getDefault(); }
public float getLetterSpacing() { return 1.0f; }
public Style getStyle() {
return style;
return Style.values[native_get_style(paint)];
}
private static native long native_create();
private static native long native_clone(long paint);
private static native void native_recycle(long paint);
private static native void native_set_color(long paint, int color);
private static native int native_get_color(long paint);
private static native void native_set_style(long paint, int style);
private static native int native_get_style(long paint);
private static native void native_set_stroke_width(long paint, float width);
private static native float native_get_stroke_width(long paint);
private static native void native_set_stroke_cap(long paint, int cap);
private static native int native_get_stroke_cap(long paint);
private static native void native_set_stroke_join(long paint, int join);
private static native int native_get_stroke_join(long paint);
private static native void native_set_text_size(long paint, float size);
private static native float native_get_text_size(long paint);
private static native void native_set_color_filter(long paint, int mode, int color);
}