From 3f4cc46bc18cff06bafff041407884b90947691c Mon Sep 17 00:00:00 2001 From: seven332 Date: Tue, 12 Apr 2016 01:09:13 +0800 Subject: [PATCH] Do not show animation for image has no valid rect --- .../java/com/hippo/ehviewer/gallery/gl/GalleryPageView.java | 3 ++- .../main/java/com/hippo/ehviewer/gallery/gl/ImageView.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/gl/GalleryPageView.java b/app/src/main/java/com/hippo/ehviewer/gallery/gl/GalleryPageView.java index f8691d12f..90d971e99 100644 --- a/app/src/main/java/com/hippo/ehviewer/gallery/gl/GalleryPageView.java +++ b/app/src/main/java/com/hippo/ehviewer/gallery/gl/GalleryPageView.java @@ -121,7 +121,8 @@ public class GalleryPageView extends GLFrameLayout { } public void showInfo() { - mImage.setVisibility(GONE); + // For image valid rect + mImage.setVisibility(INVISIBLE); mInfo.setVisibility(VISIBLE); } diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/gl/ImageView.java b/app/src/main/java/com/hippo/ehviewer/gallery/gl/ImageView.java index 8e83afea8..f9b488a97 100644 --- a/app/src/main/java/com/hippo/ehviewer/gallery/gl/ImageView.java +++ b/app/src/main/java/com/hippo/ehviewer/gallery/gl/ImageView.java @@ -222,8 +222,9 @@ public class ImageView extends GLView implements ImageTexture.Callback { mTextureHeight = 1; } - // Start alpha animation - if (isAttachedToRoot()) { + // Start alpha animation, do not show animation for image has no valid rect + getValidRect(mValidRect); + if (!mValidRect.isEmpty()) { startAnimation(mAlphaAnimation, true); } } else {