You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mi...@apache.org on 2018/03/01 08:14:40 UTC

[1/2] incubator-weex git commit: [WEEX-222][android] Sticky header in waterfall is not sticky

Repository: incubator-weex
Updated Branches:
  refs/heads/master eb94be56b -> b948d6855


[WEEX-222][android] Sticky header in waterfall is not sticky


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5ce93c7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5ce93c7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5ce93c7f

Branch: refs/heads/master
Commit: 5ce93c7fdeaacf35c7adf5bdeaeacdc0bf474cc9
Parents: 22cbd5b
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Mon Feb 26 20:30:55 2018 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Mon Feb 26 20:30:55 2018 +0800

----------------------------------------------------------------------
 .../com/taobao/weex/ui/component/list/BasicListComponent.java     | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ce93c7f/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index 2ea3254..b849419 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -601,6 +601,9 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
             if (pos <= firstVisiblePosition || (cell.getStickyOffset() > 0 && firstVisiblePosition < pos && pos <= lastVisiblePosition  &&
                     top <= cell.getStickyOffset())) {
               beforeFirstVisibleItem = true;
+              if(pos > currentStickyPos) {
+                currentStickyPos = pos;
+              }
             }else{
               removeOldSticky = true;
             }


[2/2] incubator-weex git commit: Merge remote-tracking branch 'upstream/pr1041' into apache-master

Posted by mi...@apache.org.
Merge remote-tracking branch 'upstream/pr1041' into apache-master


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b948d685
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b948d685
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b948d685

Branch: refs/heads/master
Commit: b948d685549d1d64392cd331f2634e315b5ef1bb
Parents: eb94be5 5ce93c7
Author: misakuo <mi...@apache.org>
Authored: Thu Mar 1 16:14:22 2018 +0800
Committer: misakuo <mi...@apache.org>
Committed: Thu Mar 1 16:14:22 2018 +0800

----------------------------------------------------------------------
 .../com/taobao/weex/ui/component/list/BasicListComponent.java     | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b948d685/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
----------------------------------------------------------------------