Citra-emu/citra-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes to the UX (#126)

Browse Source
This commit is contained in:
zhang wei 2020-06-03 06:04:22 +08:00 committed by bunnei
parent 1e34cde400
commit 7f9f84f9ea
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoRoundedCornersTransformation.java
View File

@ -12,18 +12,19 @@ import com.squareup.picasso.Transformation;
public class PicassoRoundedCornersTransformation implements Transformation { public class PicassoRoundedCornersTransformation implements Transformation {
@Override @Override
public Bitmap transform(Bitmap icon) { public Bitmap transform(Bitmap icon) {
final Rect rect = new Rect(0, 0, icon.getWidth(), icon.getHeight()); final int width = icon.getWidth();
final int size = Math.min(icon.getWidth(), icon.getHeight()); final int height = icon.getHeight();
final int x = (icon.getWidth() - size) / 2; final Rect rect = new Rect(0, 0, width, height);
final int y = (icon.getHeight() - size) / 2; 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); Bitmap squaredBitmap = Bitmap.createBitmap(icon, x, y, size, size);
if (squaredBitmap != icon) { if (squaredBitmap != icon) {
icon.recycle(); icon.recycle();
} }
Bitmap output = Bitmap output = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
Bitmap.createBitmap(icon.getWidth(), icon.getHeight(), Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(output); Canvas canvas = new Canvas(output);
BitmapShader shader = new BitmapShader(squaredBitmap, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP); BitmapShader shader = new BitmapShader(squaredBitmap, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP);
Paint paint = new Paint(); Paint paint = new Paint();

2
src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoUtils.java
View File

@ -32,8 +32,6 @@ public class PicassoUtils {
Picasso Picasso
.get() .get()
.load(Uri.parse("iso:/" + gamePath)) .load(Uri.parse("iso:/" + gamePath))
.noFade()
.placeholder(R.drawable.no_icon)
.fit() .fit()
.centerInside() .centerInside()
.config(Bitmap.Config.RGB_565) .config(Bitmap.Config.RGB_565)

2
src/android/app/src/main/jni/native.cpp
View File

@ -373,7 +373,7 @@ jintArray Java_org_citra_citra_1emu_NativeLibrary_GetIcon(JNIEnv* env,
return 0; return 0;
} }
jintArray icon = env->NewIntArray(static_cast<jsize>(icon_data.size())); jintArray icon = env->NewIntArray(static_cast<jsize>(icon_data.size() / 2));
env->SetIntArrayRegion(icon, 0, env->GetArrayLength(icon), env->SetIntArrayRegion(icon, 0, env->GetArrayLength(icon),
reinterpret_cast<jint*>(icon_data.data())); reinterpret_cast<jint*>(icon_data.data()));