修复 width height wrap_content padding margin 导致的问题

mevermore · Jun 7, 2020 · 2d788fb · 2d788fb
1 parent 32d50b1
commit 2d788fb
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/refresh-layout/src/main/java/com/scwang/smartrefresh/layout/SmartRefreshLayout.java b/refresh-layout/src/main/java/com/scwang/smartrefresh/layout/SmartRefreshLayout.java
@@ -609,11 +609,12 @@ protected void onMeasure(final int widthMeasureSpec,final int heightMeasureSpec)
                                 ((needPreview && showHeader) ? mHeaderHeight : 0) +
                                 ((needPreview && showFooter) ? mFooterHeight : 0), lp.height);
                 contentView.measure(widthSpec, heightSpec);
-                minimumWidth += contentView.getMeasuredWidth();
-                minimumHeight += contentView.getMeasuredHeight();
+                minimumWidth += contentView.getMeasuredWidth() + mlp.leftMargin + mlp.rightMargin;
+                minimumHeight += contentView.getMeasuredHeight() + mlp.topMargin + mlp.bottomMargin;
             }
         }
-
+        minimumWidth += thisView.getPaddingLeft() + thisView.getPaddingRight();
+        minimumHeight += thisView.getPaddingTop() + thisView.getPaddingBottom();
         super.setMeasuredDimension(
                 View.resolveSize(minimumWidth, widthMeasureSpec),
                 View.resolveSize(minimumHeight, heightMeasureSpec));