diff options
| -rw-r--r-- | src/com/android/gallery3d/ui/PhotoView.java | 7 | ||||
| -rw-r--r-- | src/com/android/gallery3d/ui/SlideshowView.java | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java index a5a15bf43..a7357e034 100644 --- a/src/com/android/gallery3d/ui/PhotoView.java +++ b/src/com/android/gallery3d/ui/PhotoView.java @@ -1259,10 +1259,11 @@ public class PhotoView extends GLView { mIgnoreUpEvent = false; return; } - if (!mFilmMode || mHadFling) { - snapback(); - } else { + + if (mFilmMode && !mHadFling && mFirstScrollX) { snapToNeighborImage(); + } else { + snapback(); } } diff --git a/src/com/android/gallery3d/ui/SlideshowView.java b/src/com/android/gallery3d/ui/SlideshowView.java index a057bb748..bb36c47e9 100644 --- a/src/com/android/gallery3d/ui/SlideshowView.java +++ b/src/com/android/gallery3d/ui/SlideshowView.java @@ -142,8 +142,8 @@ public class SlideshowView extends GLView { int viewWidth = getWidth(); int viewHeight = getHeight(); - float initScale = Math.min(2f, Math.min((float) - viewWidth / mWidth, (float) viewHeight / mHeight)); + float initScale = Math.min((float) + viewWidth / mWidth, (float) viewHeight / mHeight); float scale = initScale * (1 + SCALE_SPEED * mProgress); float centerX = viewWidth / 2 + mMovingVector.x * mProgress; |