You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/14 12:39:45 UTC
[1/2] incubator-weex git commit: * [ios] recalculate border radius if frame is changed * demo： http://dotwe.org/weex/1dd72e706721b485414bfd0b232cdd63
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev 686b81702 -> f9b423743
* [ios] recalculate border radius if frame is changed
* demo\uff1a http://dotwe.org/weex/1dd72e706721b485414bfd0b232cdd63
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1b9c86e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1b9c86e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1b9c86e9
Branch: refs/heads/0.11-dev
Commit: 1b9c86e91c393f7e06dfa6f7a974c637b47960b4
Parents: e429628
Author: \u9690\u98ce <cx...@apache.org>
Authored: Tue Mar 14 18:08:04 2017 +0800
Committer: \u9690\u98ce <cx...@apache.org>
Committed: Tue Mar 14 18:08:04 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1b9c86e9/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m b/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
index 5053cd6..ebed910 100644
--- a/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
+++ b/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
@@ -126,6 +126,8 @@
}
}
+ [self _resetNativeBorderRadius];
+
if (strongSelf->_transform) {
[strongSelf->_transform applyTransformForView:strongSelf.view];
}
[2/2] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.11-dev' into 0.11-dev
Posted by cx...@apache.org.
Merge remote-tracking branch 'upstream/0.11-dev' into 0.11-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f9b42374
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f9b42374
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f9b42374
Branch: refs/heads/0.11-dev
Commit: f9b423743902ffee01969b917f88702cf69ea08d
Parents: 1b9c86e 686b817
Author: \u9690\u98ce <cx...@apache.org>
Authored: Tue Mar 14 18:08:14 2017 +0800
Committer: \u9690\u98ce <cx...@apache.org>
Committed: Tue Mar 14 18:08:14 2017 +0800
----------------------------------------------------------------------
.../java/com/alibaba/weex/WXPageActivity.java | 2 +-
.../extend/module/location/DefaultLocation.java | 110 ++++++++++---------
.../taobao/weex/ui/component/WXComponent.java | 5 +-
.../adapter/WXRecyclerViewOnScrollListener.java | 28 +++--
4 files changed, 84 insertions(+), 61 deletions(-)
----------------------------------------------------------------------