You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/04/27 06:52:54 UTC
[3/6] incubator-weex git commit: * [android] avoid case of
mColumnWidth ==0
* [android] avoid case of mColumnWidth ==0
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d84b0737
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d84b0737
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d84b0737
Branch: refs/heads/0.12-dev
Commit: d84b0737676ce2f1c0594edb776c46fff1965328
Parents: 1fc3db3
Author: zshshr <zh...@gmail.com>
Authored: Wed Apr 26 16:48:01 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Wed Apr 26 16:48:01 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/dom/WXRecyclerDomObject.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d84b0737/android/sdk/src/main/java/com/taobao/weex/dom/WXRecyclerDomObject.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXRecyclerDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXRecyclerDomObject.java
index 6df4b6c..b4b0be0 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXRecyclerDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXRecyclerDomObject.java
@@ -67,7 +67,7 @@ public class WXRecyclerDomObject extends WXDomObject{
if (!mIsPreCalculateCellWidth) {
preCalculateCellWidth();
}
- if(mColumnWidth!=0 &&mColumnCount!= Float.NaN) {
+ if(mColumnWidth!=0 && mColumnWidth!= Float.NaN) {
child.getStyles().put(Constants.Name.WIDTH, mColumnWidth);
}
}
@@ -106,7 +106,7 @@ public class WXRecyclerDomObject extends WXDomObject{
public void updateRecyclerAttr(){
preCalculateCellWidth();
- if(mColumnWidth!=0 &&mColumnCount!= Float.NaN){
+ if(mColumnWidth!=0 && mColumnWidth!= Float.NaN){
WXLogUtils.w("preCalculateCellWidth mColumnGap :" + mColumnGap + " mColumnWidth:" + mColumnWidth + " mColumnCount:" + mColumnCount);
return;
}