From 97f3d0ae30e786873d51640170ee09c2758368ba Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Thu, 28 Jan 2016 15:08:26 +0800
Subject: [PATCH] Fix missing original padding in FitPaddingLayout

---
 .../java/com/hippo/ehviewer/widget/FitPaddingLayout.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/widget/FitPaddingLayout.java b/app/src/main/java/com/hippo/ehviewer/widget/FitPaddingLayout.java
index 8596e1b9e..da6783c5d 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/FitPaddingLayout.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/FitPaddingLayout.java
@@ -81,6 +81,9 @@ public class FitPaddingLayout extends OffsetLayout {
                         content.getPaddingRight(),
                         paddingBottom == -1 ? content.getPaddingBottom() : paddingBottom);
             }
+            mContentList.clear();
+            mPaddingTopList.clear();
+            mPaddingBottomList.clear();
         }
     };
 
@@ -135,10 +138,12 @@ public class FitPaddingLayout extends OffsetLayout {
         int newPaddingTop = -1;
         int newPaddingBottom = -1;
         if (fitTop != null) {
-            newPaddingTop = fitTop.getBottom() - ((LayoutParams) fitTop.getLayoutParams()).offsetY;
+            newPaddingTop = originalPaddingTop + fitTop.getBottom() -
+                    ((LayoutParams) fitTop.getLayoutParams()).offsetY;
         }
         if (fitBottom != null) {
-            newPaddingBottom = getHeight() - fitBottom.getTop() - ((LayoutParams) fitBottom.getLayoutParams()).offsetY;
+            newPaddingBottom = originalPaddingBottom + getHeight() - fitBottom.getTop() -
+                    ((LayoutParams) fitBottom.getLayoutParams()).offsetY;
         }
         newPaddins[0] = newPaddingTop;
         newPaddins[1] = newPaddingBottom;