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/07/09 03:18:19 UTC
incubator-weex git commit: [WEEX-496][iOS] In CoreText mode,
origin of first line is incorret under iOS9 or lower.
Repository: incubator-weex
Updated Branches:
refs/heads/master 003765f73 -> 402feabd7
[WEEX-496][iOS] In CoreText mode, origin of first line is incorret under iOS9 or lower.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/402feabd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/402feabd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/402feabd
Branch: refs/heads/master
Commit: 402feabd796476d9d95d515a4919d0dae10407ff
Parents: 003765f
Author: 神漠 <qi...@alipay.com>
Authored: Sun Jul 8 17:05:09 2018 +0800
Committer: 神漠 <qi...@alipay.com>
Committed: Sun Jul 8 17:05:09 2018 +0800
----------------------------------------------------------------------
.../WeexSDK/Sources/Component/WXTextComponent.mm | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/402feabd/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.mm
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.mm b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.mm
index 714b2ed..4918dea 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.mm
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.mm
@@ -144,6 +144,8 @@ CGFloat WXTextDefaultLineThroughWidth = 1.2;
NSString *_textOverflow;
CGFloat _lineHeight;
CGFloat _letterSpacing;
+ CGFloat _fontDescender;
+ CGFloat _fontAscender;
BOOL _truncationLine; // support trunk tail
NSAttributedString * _ctAttributedString;
@@ -289,7 +291,6 @@ do {\
_padding = flex_padding;
[self setNeedsRepaint];
}
-
}
- (void)fillAttributes:(NSDictionary *)attributes
@@ -312,7 +313,6 @@ do {\
pthread_mutex_lock(&(_ctAttributedStringMutex));
_ctAttributedString = nil;
pthread_mutex_unlock(&(_ctAttributedStringMutex));
-
}
#pragma mark - Subclass
@@ -484,6 +484,10 @@ do {\
CTFontRef ctFont = CTFontCreateWithName((__bridge CFStringRef)font.fontName,
font.pointSize,
NULL);
+
+ _fontAscender = font.ascender;
+ _fontDescender = font.descender;
+
if (ctFont) {
[attributedString addAttribute:(id)kCTFontAttributeName value:(__bridge id)(ctFont) range:NSMakeRange(0, string.length)];
CFRelease(ctFont);
@@ -776,6 +780,15 @@ do {\
BOOL needTruncation = NO;
CTLineRef ctTruncatedLine = NULL;
CTFrameGetLineOrigins(_coreTextFrameRef, CFRangeMake(0, 0), lineOrigins);
+
+ CGFloat fixDescent = 0;
+ if (lineCount > 0 && _lineHeight && WX_SYS_VERSION_LESS_THAN(@"10.0")) {
+ CGFloat ascent, descent, leading;
+ CTLineRef line1 = (CTLineRef)CFArrayGetValueAtIndex(ctLines, 0);
+ CTLineGetTypographicBounds(line1, &ascent, &descent, &leading);
+ fixDescent = (descent + _fontDescender) + (ascent - _fontAscender);
+ }
+
for (CFIndex lineIndex = 0;(!_lines || _lines > lineIndex) && lineIndex < lineCount; lineIndex ++) {
CTLineRef lineRef = NULL;
lineRef = (CTLineRef)CFArrayGetValueAtIndex(ctLines, lineIndex);
@@ -784,7 +797,7 @@ do {\
}
CGPoint lineOrigin = lineOrigins[lineIndex];
lineOrigin.x += padding.left;
- lineOrigin.y -= padding.top;
+ lineOrigin.y -= padding.top + fixDescent;
CFArrayRef runs = CTLineGetGlyphRuns(lineRef);
[mutableLines addObject:(__bridge id _Nonnull)(lineRef)];
// lineIndex base 0