Merge pull request #1 from ValuesFeng/master

fix a bug that dynamic height in headerview
w446108264 · Apr 11, 2016 · fa043ea · fa043ea
2 parents 13687cb + dd28957
commit fa043ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ and:
 
 ```xml
 dependencies { 
-    compile 'com.github.w446108264:ScrollableLayout:1.0.1'
+   compile 'com.github.w446108264:ScrollableLayout:1.0.1'
 }
 ```
 --

diff --git a/ScrollableLayout/library/src/main/java/com/scrollablelayout/ScrollableLayout.java b/ScrollableLayout/library/src/main/java/com/scrollablelayout/ScrollableLayout.java
@@ -97,8 +97,8 @@ public ScrollableLayout(Context context, AttributeSet attrs, int defStyleAttr) {
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        if(mHeadView == null){
-            mHeadView = getChildAt(0);
+        mHeadView = getChildAt(0);
+        if(mHeadView ！= null){
             measureChildWithMargins(mHeadView, widthMeasureSpec, 0, MeasureSpec.UNSPECIFIED, 0);
             maxY = mHeadView.getMeasuredHeight();
             mHeadHeight = mHeadView.getMeasuredHeight();
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,7 @@ and: @@
     ```xml
     dependencies {
-        compile 'com.github.w446108264:ScrollableLayout:1.0.1'
+       compile 'com.github.w446108264:ScrollableLayout:1.0.1'
     }
     ```
     --
@@ Expand Down @@