From f51d920388272e5fa29af02f07b8389cf7599e59 Mon Sep 17 00:00:00 2001 From: Takeshi Hagikura Date: Wed, 28 Jun 2017 13:17:41 +0900 Subject: [PATCH] Fix the view index used for stretching views. (#322) Basically, it apply the same fix as another PR https://github.com/google/flexbox-layout/pull/304 to the method that stretches views. --- .../main/java/com/google/android/flexbox/FlexboxHelper.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/flexbox/src/main/java/com/google/android/flexbox/FlexboxHelper.java b/flexbox/src/main/java/com/google/android/flexbox/FlexboxHelper.java index ee43535..0b3f425 100644 --- a/flexbox/src/main/java/com/google/android/flexbox/FlexboxHelper.java +++ b/flexbox/src/main/java/com/google/android/flexbox/FlexboxHelper.java @@ -1560,7 +1560,6 @@ class FlexboxHelper { } int flexDirection = mFlexContainer.getFlexDirection(); if (mFlexContainer.getAlignItems() == AlignItems.STRETCH) { - int viewIndex = fromIndex; int flexLineIndex = 0; if (mIndexToFlexLine != null) { flexLineIndex = mIndexToFlexLine[fromIndex]; @@ -1568,8 +1567,8 @@ class FlexboxHelper { List flexLines = mFlexContainer.getFlexLinesInternal(); for (int i = flexLineIndex, size = flexLines.size(); i < size; i++) { FlexLine flexLine = flexLines.get(i); - for (int j = 0, itemCount = flexLine.mItemCount; j < itemCount; - j++, viewIndex++) { + for (int j = 0, itemCount = flexLine.mItemCount; j < itemCount; j++) { + int viewIndex = flexLine.mFirstIndex + j; if (j >= mFlexContainer.getFlexItemCount()) { continue; } -- GitLab