Merge pull request maurycyw#30 from BenoitDuffez/master

Fix a bug and add an improvement
yuzhiqiang400 · Jun 24, 2013 · 1921d6e · 1921d6e
2 parents 16b33cc + 98ad943
commit 1921d6e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
@@ -3,5 +3,6 @@
     <declare-styleable name="StaggeredGridView">
         <attr name="drawSelectorOnTop" format="boolean" />
         <attr name="numColumns" format="integer" />
+        <attr name="itemMargin" format="dimension" />
     </declare-styleable>
-</resources>
+</resources>
diff --git a/src/com/origamilabs/library/views/StaggeredGridView.java b/src/com/origamilabs/library/views/StaggeredGridView.java
@@ -311,6 +311,7 @@ public StaggeredGridView(Context context, AttributeSet attrs, int defStyle) {
         	TypedArray a=getContext().obtainStyledAttributes( attrs, R.styleable.StaggeredGridView);
             mColCount = a.getInteger(R.styleable.StaggeredGridView_numColumns, 2);
             mDrawSelectorOnTop = a.getBoolean(R.styleable.StaggeredGridView_drawSelectorOnTop, false);
+            mItemMargin = (int) a.getDimension(R.styleable.StaggeredGridView_itemMargin, 0);
         }else{
         	mColCount = 2;
         	mDrawSelectorOnTop = false;
@@ -2105,7 +2106,7 @@ private SavedState(Parcel in) {
             super(in);
             firstId = in.readLong();
             position = in.readInt();
-            in.readIntArray(topOffsets);
+            in.createIntArray(topOffsets);
             in.readTypedList(mapping, ColMap.CREATOR);
 
         }
@@ -2633,4 +2634,4 @@ public void setDrawSelectorOnTop(boolean mDrawSelectorOnTop) {
 	}
 
 
-}
+}