summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
index 4923398082..7d949befed 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
@@ -106,11 +106,14 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
// Determine the button size based on the smaller screen dimension.
// This makes sure the buttons are the same size in both portrait and landscape.
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,
- (int) (minDimension * scale),
- (int) (minDimension * scale),
+ (int) (bitmap.getWidth() * bitmapScale),
+ (int) (bitmap.getHeight() * bitmapScale),
true);
}