ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: Allow non-square overlay control images 

This removes an assumption in the code which made every overlay control
image be scaled to a square even if the actual image was rectangular.
This commit is contained in:
JosJuice 2021-07-23 13:04:16 +02:00
parent f380c23fda
commit 3accb06fe1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
View File

@ -102,11 +102,14 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
// Determine the button size based on the smaller screen dimension. // Determine the button size based on the smaller screen dimension.
// This makes sure the buttons are the same size in both portrait and landscape. // This makes sure the buttons are the same size in both portrait and landscape.
DisplayMetrics dm = context.getResources().getDisplayMetrics(); DisplayMetrics dm = context.getResources().getDisplayMetrics();
int minDimension = Math.min(dm.widthPixels, dm.heightPixels); int minScreenDimension = Math.min(dm.widthPixels, dm.heightPixels);
int maxBitmapDimension = Math.max(bitmap.getWidth(), bitmap.getHeight());
float bitmapScale = scale * minScreenDimension / maxBitmapDimension;
return Bitmap.createScaledBitmap(bitmap, return Bitmap.createScaledBitmap(bitmap,
(int) (minDimension * scale), (int) (bitmap.getWidth() * bitmapScale),
(int) (minDimension * scale), (int) (bitmap.getHeight() * bitmapScale),
true); true);
} }