diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoRoundedCornersTransformation.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoRoundedCornersTransformation.java index 10e4f7053..892b46387 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoRoundedCornersTransformation.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoRoundedCornersTransformation.java @@ -12,18 +12,19 @@ import com.squareup.picasso.Transformation; public class PicassoRoundedCornersTransformation implements Transformation { @Override public Bitmap transform(Bitmap icon) { - final Rect rect = new Rect(0, 0, icon.getWidth(), icon.getHeight()); - final int size = Math.min(icon.getWidth(), icon.getHeight()); - final int x = (icon.getWidth() - size) / 2; - final int y = (icon.getHeight() - size) / 2; + final int width = icon.getWidth(); + final int height = icon.getHeight(); + final Rect rect = new Rect(0, 0, width, height); + final int size = Math.min(width, height); + final int x = (width - size) / 2; + final int y = (height - size) / 2; Bitmap squaredBitmap = Bitmap.createBitmap(icon, x, y, size, size); if (squaredBitmap != icon) { icon.recycle(); } - Bitmap output = - Bitmap.createBitmap(icon.getWidth(), icon.getHeight(), Bitmap.Config.ARGB_8888); + Bitmap output = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); Canvas canvas = new Canvas(output); BitmapShader shader = new BitmapShader(squaredBitmap, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP); Paint paint = new Paint(); diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoUtils.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoUtils.java index f697d4ad2..c99726685 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoUtils.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoUtils.java @@ -32,8 +32,6 @@ public class PicassoUtils { Picasso .get() .load(Uri.parse("iso:/" + gamePath)) - .noFade() - .placeholder(R.drawable.no_icon) .fit() .centerInside() .config(Bitmap.Config.RGB_565) diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index be513d1ef..90d030e41 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp @@ -373,7 +373,7 @@ jintArray Java_org_citra_citra_1emu_NativeLibrary_GetIcon(JNIEnv* env, return 0; } - jintArray icon = env->NewIntArray(static_cast(icon_data.size())); + jintArray icon = env->NewIntArray(static_cast(icon_data.size() / 2)); env->SetIntArrayRegion(icon, 0, env->GetArrayLength(icon), reinterpret_cast(icon_data.data()));