You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/10/19 05:55:09 UTC
[1/2] incubator-weex git commit: * [android] fix wrong logic when set
box-shadow on adapter view
Repository: incubator-weex
Updated Branches:
refs/heads/release-0.16 ebd058eb1 -> 320e48230
* [android] fix wrong logic when set box-shadow on adapter view
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/499ee281
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/499ee281
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/499ee281
Branch: refs/heads/release-0.16
Commit: 499ee281afd8abe25c167be8b822262d35591798
Parents: 7f6203c
Author: misakuo <mi...@apache.org>
Authored: Thu Oct 19 12:19:11 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Thu Oct 19 12:19:11 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/WXComponent.java | 4 ++--
.../java/com/taobao/weex/ui/component/WXVContainer.java | 12 ++++++++----
2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/499ee281/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index add0205..3df1492 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -866,7 +866,7 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
View target = mHost;
if (this instanceof WXVContainer) {
- target = ((WXVContainer) this).getBoxShadowHost();
+ target = ((WXVContainer) this).getBoxShadowHost(false);
}
if (target == null) {
@@ -909,7 +909,7 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
protected void clearBoxShadow() {
View target = mHost;
if (this instanceof WXVContainer) {
- target = ((WXVContainer) this).getBoxShadowHost();
+ target = ((WXVContainer) this).getBoxShadowHost(true);
}
if (target != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/499ee281/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
index 001509e..5e01316 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
@@ -25,12 +25,11 @@ import android.util.Pair;
import android.view.Menu;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.HorizontalScrollView;
-import android.widget.ScrollView;
import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.common.Constants;
import com.taobao.weex.dom.WXDomObject;
+import com.taobao.weex.ui.view.WXFrameLayout;
import com.taobao.weex.utils.WXLogUtils;
import com.taobao.weex.utils.WXViewUtils;
@@ -483,13 +482,18 @@ public abstract class WXVContainer<T extends ViewGroup> extends WXComponent<T> {
* end hook Activity life cycle callback
********************************************************/
- public @Nullable View getBoxShadowHost() {
+ public @Nullable View getBoxShadowHost(boolean isClear) {
+ if (isClear) {
+ // Return existed host if want clear shadow
+ return mBoxShadowHost;
+ }
+
ViewGroup hostView = getHostView();
if (hostView == null) {
return null;
}
- if (hostView instanceof ScrollView || hostView instanceof HorizontalScrollView) {
+ if (!(hostView instanceof WXFrameLayout)) {
return hostView;
}
[2/2] incubator-weex git commit: * [android] fix wrong logic when set
box-shadow on adapter view
Posted by gu...@apache.org.
* [android] fix wrong logic when set box-shadow on adapter view
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/320e4823
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/320e4823
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/320e4823
Branch: refs/heads/release-0.16
Commit: 320e48230afd0cf193d960aae4faf8521d8d0a3b
Parents: ebd058e 499ee28
Author: gurisxie <27...@qq.com>
Authored: Thu Oct 19 13:54:16 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Thu Oct 19 13:54:52 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/WXComponent.java | 4 ++--
.../java/com/taobao/weex/ui/component/WXVContainer.java | 12 ++++++++----
2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/320e4823/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/320e4823/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
----------------------------------------------------------------------