diff options
| author | jinwu <jinwu@codeaurora.org> | 2017-02-24 16:52:29 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-26 19:21:33 -0800 |
| commit | a1706c728b498bf3306de7c354722d4103cedf50 (patch) | |
| tree | b0f773b0b2e894d00a255fe1d786d8e9dae10d0f /src | |
| parent | 25c54f839b9dfba2745cb8a6b230deaa2b8770bb (diff) | |
| download | android_packages_apps_Gallery2-a1706c728b498bf3306de7c354722d4103cedf50.tar.gz android_packages_apps_Gallery2-a1706c728b498bf3306de7c354722d4103cedf50.tar.bz2 android_packages_apps_Gallery2-a1706c728b498bf3306de7c354722d4103cedf50.zip | |
Fix square rotation beyond screen issue
When the image is square, filter show activity rotate to
landscape, image will beyond screen. Fix it.
Change-Id: Ie2de8a4cb18a4dad156a9c204423afef4aca3dee
CRs-Fixed: 1104479
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/gallery3d/filtershow/imageshow/MasterImage.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java index d8911b305..19ab0864e 100755 --- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java +++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java @@ -746,9 +746,9 @@ public class MasterImage implements RenderingRequestCaller { bitmapToDraw.getWidth(), bitmapToDraw.getHeight()); scale = mImageShowSize.x / size.width(); - if (size.width() < size.height()) { - scale = mImageShowSize.y / size.height(); - } + float tmp = mImageShowSize.y / size.height(); + // Choose the smaller one to avoid master image beyound the screen. + scale = scale < tmp ? scale : tmp; translateX = (mImageShowSize.x - (size.width() * scale)) / 2.0f; translateY = (mImageShowSize.y - (size.height() * scale)) / 2.0f; } else { |