@emir-hasanbegovic/@anthony-tarantini [#69447912] finished adding pad…

…ding support for clip to padding
EmirWeb · Apr 21, 2014 · 06c0f8e · 06c0f8e
1 parent a966fb7
commit 06c0f8e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/library/src/main/java/mobi/parchment/widget/adapterview/LayoutManager.java b/library/src/main/java/mobi/parchment/widget/adapterview/LayoutManager.java
@@ -524,8 +524,7 @@ public int getAdapterCount() {
     /**
      * When moving left, every time a view is removed, this means that we are removing the leftMost view and therefore have to increment the mOffset by the removed view's width
      */
-    private void layoutCells(final AdapterViewHandler adapterViewHandler, final int size,
-                             final int breadth) {
+    private void layoutCells(final AdapterViewHandler adapterViewHandler, final int size, final int breadth) {
         final int startSizePadding = getStartSizePadding();
         final int endSizePadding = getEndSizePadding();
         mLayoutCellCount = 0;
@@ -575,7 +574,7 @@ private void layoutCells(final AdapterViewHandler adapterViewHandler, final int
             }
         }
 
-        while (currentOffset + cellSpacing <= size + startSizePadding) {
+        while (currentOffset <= size + startSizePadding  + endSizePadding) {
             final int firstAdapterPosition = getFirstAdapterPositionInCell(endCellPosition);
             final int adapterCount = mAdapterViewManager.getAdapterCount();
             final boolean aboveCount = firstAdapterPosition >= adapterCount;
@@ -623,7 +622,7 @@ private void layoutCells(final AdapterViewHandler adapterViewHandler, final int
         currentOffset = mOffset;
         int cellPosition = decrementCellPosition(mStartCellPosition);
 
-        while (currentOffset > startSizePadding) {
+        while (currentOffset > 0) {
             final int adapterPosition = getFirstAdapterPositionInCell(cellPosition);
             final boolean belowCount = adapterPosition < 0;
             if (belowCount) break;

diff --git a/sample/res/layout/activity_simple_horizontal.xml b/sample/res/layout/activity_simple_horizontal.xml
@@ -8,7 +8,8 @@
         parchment:orientation="horizontal"
         parchment:snapPosition="onScreen"
         parchment:snapToPosition="true"
-        android:padding="15dp"
+        android:clipToPadding="false"
+        android:padding="@dimen/activity_sample_horizontal_parchment_padding"
         android:scrollbars="horizontal"
         android:scrollbarAlwaysDrawHorizontalTrack="true"
         android:layout_width="match_parent"

diff --git a/sample/res/values/dimens.xml b/sample/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="activity_sample_horizontal_parchment_padding">15dp</dimen>
+</resources>