Merge pull request #1229 from rcancro/disableWordKerning

[ASTextNode] Remove wordkerner to fix jumbled text bug
This commit is contained in:
appleguy 2016-02-16 11:27:46 -08:00
commit 52afe2a6ac

View File

@ -21,7 +21,6 @@
#import "ASTextKitRenderer.h" #import "ASTextKitRenderer.h"
#import "ASTextKitRenderer+Positioning.h" #import "ASTextKitRenderer+Positioning.h"
#import "ASTextKitShadower.h" #import "ASTextKitShadower.h"
#import "ASTextNodeWordKerner.h"
#import "ASInternalHelpers.h" #import "ASInternalHelpers.h"
#import "ASEqualityHelpers.h" #import "ASEqualityHelpers.h"
@ -81,10 +80,6 @@ static NSString *ASTextNodeTruncationTokenAttributeName = @"ASTextNodeTruncation
ASTextKitRenderer *_renderer; ASTextKitRenderer *_renderer;
UILongPressGestureRecognizer *_longPressGestureRecognizer; UILongPressGestureRecognizer *_longPressGestureRecognizer;
ASDN::Mutex _wordKernerLock;
ASTextNodeWordKerner *_wordKerner;
} }
@dynamic placeholderEnabled; @dynamic placeholderEnabled;
@ -248,7 +243,6 @@ static NSArray *DefaultLinkAttributeNames = @[ NSLinkAttributeName ];
.maximumNumberOfLines = _maximumNumberOfLines, .maximumNumberOfLines = _maximumNumberOfLines,
.exclusionPaths = _exclusionPaths, .exclusionPaths = _exclusionPaths,
.minimumScaleFactor = _minimumScaleFactor, .minimumScaleFactor = _minimumScaleFactor,
.layoutManagerDelegate = [self _wordKerner],
}; };
} }
@ -284,15 +278,6 @@ static NSArray *DefaultLinkAttributeNames = @[ NSLinkAttributeName ];
} }
} }
- (ASTextNodeWordKerner *)_wordKerner
{
ASDN::MutexLocker l(_wordKernerLock);
if (_wordKerner == nil) {
_wordKerner = [[ASTextNodeWordKerner alloc] init];
}
return _wordKerner;
}
#pragma mark - Layout and Sizing #pragma mark - Layout and Sizing
- (BOOL)_needInvalidateRendererForBoundsSize:(CGSize)boundsSize - (BOOL)_needInvalidateRendererForBoundsSize:(CGSize)boundsSize