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/31 03:01:58 UTC
[1/2] incubator-weex git commit: fix【iOS】If setFrame(0, 0, width, 0), sometime it will not adjust the height with content
Repository: incubator-weex
Updated Branches:
refs/heads/0.12-dev e4cbdc468 -> c3b77660b
fix\u3010iOS\u3011If setFrame(0, 0, width, 0), sometime it will not adjust the height with content
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/cd68c558
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cd68c558
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cd68c558
Branch: refs/heads/0.12-dev
Commit: cd68c5588738c461c32dfafa6c689e616159c56d
Parents: c91c12f
Author: yuedong.wyd@alibaba-inc.com <yu...@alibaba-inc.com>
Authored: Fri Mar 31 10:08:57 2017 +0800
Committer: yuedong.wyd@alibaba-inc.com <yu...@alibaba-inc.com>
Committed: Fri Mar 31 10:08:57 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cd68c558/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
index f9e8fcc..09dc338 100644
--- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
+++ b/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
@@ -130,10 +130,10 @@ static NSThread *WXComponentThread;
if (_rootCSSNode) {
[self _applyRootFrame:frame toRootCSSNode:_rootCSSNode];
if (!_rootComponent.styles[@"width"]) {
- _rootComponent.cssNode->style.dimensions[CSS_WIDTH] = frame.size.width;
+ _rootComponent.cssNode->style.dimensions[CSS_WIDTH] = frame.size.width ?: CSS_UNDEFINED;
}
if (!_rootComponent.styles[@"height"]) {
- _rootComponent.cssNode->style.dimensions[CSS_HEIGHT] = frame.size.height;
+ _rootComponent.cssNode->style.dimensions[CSS_HEIGHT] = frame.size.height ?: CSS_UNDEFINED;
}
[_rootComponent setNeedsLayout];
[self startComponentTasks];
[2/2] incubator-weex git commit: Merge branch 'master' of
https://github.com/yuedongweng/incubator-weex into 0.12-dev
Posted by cx...@apache.org.
Merge branch 'master' of https://github.com/yuedongweng/incubator-weex into 0.12-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/c3b77660
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c3b77660
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c3b77660
Branch: refs/heads/0.12-dev
Commit: c3b77660bc4d5cc516e206cbeec055282adc17c5
Parents: e4cbdc4 cd68c55
Author: cxfeng <cx...@apache.org>
Authored: Fri Mar 31 11:01:49 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Fri Mar 31 11:01:49 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c3b77660/ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m
----------------------------------------------------------------------