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 drawing into Bitmaps with Canvas, make BitmapDrawable use use paintable, misc Bitmap improvements

Browse Source
This commit is contained in:
Mis012
2024-03-16 15:00:22 +01:00
parent fa1aa36f6b
commit 2e864adc0f
10 changed files with 201 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/api-impl/android/graphics/Bitmap.java
View File

@@ -141,9 +141,6 @@ public final class Bitmap {
this.pixbuf = pixbuf;
}
private native long native_bitmap_from_path(CharSequence path);
static native long native_copy(long src);
/**
* Private constructor that must received an already allocated native bitmap
* int (pointer).
@@ -790,7 +787,7 @@ public final class Bitmap {
return bitmap;
*/
return new Bitmap(native_copy(source.pixbuf));
return new Bitmap(native_copy(native_subpixbuf(source.pixbuf, x, y, width, height)));
}
/**
@@ -859,7 +856,7 @@ public final class Bitmap {
if (width <= 0 || height <= 0) {
throw new IllegalArgumentException("width and height must be > 0");
}
Bitmap bm = nativeCreate(null, 0, width, width, height, config.nativeInt, true);
Bitmap bm = new Bitmap(native_create(/*null, 0, width, */width, height/*, config.nativeInt, true*/));
if (display != null) {
bm.mDensity = display.densityDpi;
}
@@ -932,8 +929,7 @@ public final class Bitmap {
if (width <= 0 || height <= 0) {
throw new IllegalArgumentException("width and height must be > 0");
}
Bitmap bm = nativeCreate(colors, offset, stride, width, height,
config.nativeInt, false);
Bitmap bm = new Bitmap(native_create(/*colors, offset, stride, */width, height/*, config.nativeInt, false*/));
if (display != null) {
bm.mDensity = display.densityDpi;
}
@@ -1600,9 +1596,11 @@ public final class Bitmap {
//////////// native methods
private static /*native*/ Bitmap nativeCreate(int[] colors, int offset,
int stride, int width, int height,
int nativeConfig, boolean mutable) { return new Bitmap(); }
private native long native_bitmap_from_path(CharSequence path);
static native long native_copy(long src);
static native long native_subpixbuf(long src, int x, int y, int width, int height);
private static native long native_create(int width, int height);
private static native Bitmap nativeCopy(int srcBitmap, int nativeConfig,
boolean isMutable);
private static native void nativeDestructor(int nativeBitmap);

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

@@ -6,7 +6,10 @@ public class Canvas {
public Canvas() {}
public Canvas(Bitmap bmp) {}
public Canvas(Bitmap bmp) {
this.skia_canvas = native_canvas_from_bitmap(bmp.pixbuf);
this.widget = 0;
}
public Canvas(long skia_canvas, long widget) {
this.skia_canvas = skia_canvas;
@@ -23,9 +26,6 @@ public class Canvas {
native_restore(skia_canvas, widget);
}
private static native void native_save(long skia_canvas, long widget);
private static native void native_restore(long skia_canvas, long widget);
// ---
/**
@@ -222,10 +222,13 @@ public class Canvas {
* @param paint The paint used to draw the bitmap (may be null)
*/
public void drawBitmap(Bitmap bitmap, float left, float top, Paint paint) {
System.out.println("XXXXXXX bitmap(bitmap, left, top, paint)");
/*
native_drawBitmap(mNativeCanvas, bitmap.ni(), left, top, paint != null ? paint.mNativePaint : 0, mDensity, mScreenDensity, bitmap.mDensity);
*/
if(skia_canvas == 0) {
System.out.println(this + " doesn't have a skia canvas");
return;
}
native_drawBitmap(skia_canvas, widget, bitmap.pixbuf, 0, 0, bitmap.getWidth(), bitmap.getHeight(),
left, top, left + bitmap.getWidth(), top + bitmap.getHeight(),
(paint != null) ? paint.skia_paint : 0);
}
/**
@@ -254,7 +257,9 @@ public class Canvas {
if (dst == null) {
throw new NullPointerException();
}
native_drawBitmap(skia_canvas, widget, bitmap.pixbuf, src.left, src.top, dst.left, dst.top, dst.width(), dst.height(), (paint != null) ? paint.skia_paint : 0); // FIXME - ignores width/height of source
native_drawBitmap(skia_canvas, widget, bitmap.pixbuf, src.left, src.top, src.right, src.bottom,
dst.left, dst.top, dst.right, dst.bottom,
(paint != null) ? paint.skia_paint : 0);
}
/**
@@ -385,10 +390,15 @@ public class Canvas {
public void restoreToCount(int count) {}
private static native long native_canvas_from_bitmap(long pixbuf);
private static native void native_save(long skia_canvas, long widget);
private static native void native_restore(long skia_canvas, long widget);
private static native void native_drawText(long skia_canvas, CharSequence text, int start, int end, float x, float y, long skia_font, long skia_paint);
private static native void native_drawRect(long skia_canvas, float left, float top, float right, float bottom, long skia_paint);
private static native void native_drawLine(long skia_canvas, long widget, float startX, float startY, float stopX, float stopY, long skia_paint);
private static native void native_drawBitmap(long skia_canvas, long widget, long pixbuf, float src_x, float src_y, float dest_x, float dest_y, float dest_w, float dest_h, long skia_paint);
private static native void native_drawBitmap(long skia_canvas, long widget, long pixbuf, float src_left, float src_top, float src_right, float src_bottom, float dest_left, float dest_top, float dest_right, float dest_bottm, long skia_paint);
private static native void native_rotate(long skia_canvas, long widget, float angle);
private static native void native_rotate_and_translate(long skia_canvas, long widget, float angle, float tx, float ty);
}

7
src/api-impl/android/graphics/drawable/BitmapDrawable.java
View File

@@ -25,11 +25,7 @@ public class BitmapDrawable extends Drawable {
public BitmapDrawable(Resources res, Bitmap bitmap) {
this.bitmap = bitmap;
}
@Override
public void draw(Canvas canvas) {
canvas.drawBitmap(bitmap, new Rect(0, 0, bitmap.getWidth(), bitmap.getWidth()), new RectF(getBounds()), null);
this.paintable = native_paintable_from_pixbuf(bitmap.pixbuf);
}
public Bitmap getBitmap() {
@@ -45,4 +41,5 @@ public class BitmapDrawable extends Drawable {
a.recycle();
}
private static native long native_paintable_from_pixbuf(long pixbuf);
}