You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/07/13 07:28:56 UTC
[4/6] incubator-weex git commit: * [ios] fix text height @nodanger
* [ios] fix text height @nodanger
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/eb69d00c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eb69d00c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eb69d00c
Branch: refs/heads/0.15-dev
Commit: eb69d00cef4561e06946f6c24b9ced095ca8217e
Parents: 8381657
Author: acton393 <zh...@gmail.com>
Authored: Thu Jul 13 14:46:37 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Jul 13 14:46:37 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/eb69d00c/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
index 680be09..7d873a1 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
@@ -896,7 +896,7 @@ do {\
}
return suggestSize;
}
- return CGSizeMake(!isnan(aWidth)? aWidth :suggestSize.width, totalHeight >suggestSize.height? totalHeight:suggestSize.height);
+ return CGSizeMake(!isnan(aWidth)? aWidth :suggestSize.width, totalHeight);
}
static void WXTextGetRunsMaxMetric(CFArrayRef runs, CGFloat *xHeight, CGFloat *underlinePosition, CGFloat *lineThickness)