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 2018/06/19 09:41:27 UTC
[40/50] [abbrv] incubator-weex git commit: [WEEX-459][iOS] fix
transform/transformOrigin conflict when updateStyles
[WEEX-459][iOS] fix transform/transformOrigin conflict when updateStyles
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/44fd78c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/44fd78c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/44fd78c2
Branch: refs/heads/release
Commit: 44fd78c27cccc83980d3a4525b6fa884f049479d
Parents: 676d0eb
Author: hjhcn <38...@qq.com>
Authored: Tue Jun 12 17:36:00 2018 +0800
Committer: hjhcn <38...@qq.com>
Committed: Thu Jun 14 17:38:26 2018 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.mm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/44fd78c2/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.mm
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.mm b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.mm
index 29d5d87..740e168 100644
--- a/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.mm
+++ b/ios/sdk/WeexSDK/Sources/View/WXComponent+ViewManagement.mm
@@ -251,14 +251,13 @@ do {\
}
}
if (styles[@"transform"]) {
- _transform = [[WXTransform alloc] initWithCSSValue:[WXConvert NSString:styles[@"transform"]] origin:[WXConvert NSString:self.styles[@"transformOrigin"]] instance:self.weexInstance];
+ id transformOrigin = styles[@"transformOrigin"] ?: self.styles[@"transformOrigin"];
+ _transform = [[WXTransform alloc] initWithCSSValue:[WXConvert NSString:styles[@"transform"]] origin:[WXConvert NSString:transformOrigin] instance:self.weexInstance];
if (!CGRectEqualToRect(self.calculatedFrame, CGRectZero)) {
[_transform applyTransformForView:_view];
[_layer setNeedsDisplay];
}
- }
-
- if (styles[@"transformOrigin"]) {
+ }else if (styles[@"transformOrigin"]) {
[_transform setTransformOrigin:[WXConvert NSString:styles[@"transformOrigin"]]];
if (!CGRectEqualToRect(self.calculatedFrame, CGRectZero)) {
[_transform applyTransformForView:_view];