You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/03/17 07:11:37 UTC
[33/40] incubator-weex git commit: * [ios] bug fix backgroundImage
about gradientColor
* [ios] bug fix backgroundImage about gradientColor
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/93038dbf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/93038dbf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/93038dbf
Branch: refs/heads/0.12-dev
Commit: 93038dbfa325a7b3bab6aeec569e7bb95e9c3047
Parents: 21242db
Author: acton393 <zh...@gmail.com>
Authored: Thu Mar 16 19:25:44 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Mar 16 19:25:44 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXComponent+GradientColor.m | 3 +++
ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m | 4 ++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/93038dbf/ios/sdk/WeexSDK/Sources/Component/WXComponent+GradientColor.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXComponent+GradientColor.m b/ios/sdk/WeexSDK/Sources/Component/WXComponent+GradientColor.m
index 86c3379..fc16f91 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXComponent+GradientColor.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXComponent+GradientColor.m
@@ -14,6 +14,9 @@
@implementation WXComponent (GradientColor)
- (void)setGradientLayer {
+ if (CGRectEqualToRect(self.view.frame, CGRectZero)) {
+ return;
+ }
//parse gradient-color, linear-gradient(to right, #a80077,rgba(200, 54, 54, 0.5))
if ([_backgroundImage hasPrefix:@"linear-gradient"] && [_backgroundImage hasSuffix:@")"] ) {
NSRange range = NSMakeRange(16, _backgroundImage.length - 17);
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/93038dbf/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 ebed910..92c964b 100644
--- a/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
+++ b/ios/sdk/WeexSDK/Sources/Layout/WXComponent+Layout.m
@@ -13,6 +13,7 @@
#import "WXComponent_internal.h"
#import "WXSDKInstance_private.h"
#import "WXComponent+BoxShadow.h"
+#import "WXComponent+GradientColor.h"
@implementation WXComponent (Layout)
@@ -132,6 +133,9 @@
[strongSelf->_transform applyTransformForView:strongSelf.view];
}
+ if (strongSelf->_backgroundImage) {
+ [strongSelf setGradientLayer];
+ }
[strongSelf setNeedsDisplay];
}];
}