ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 14:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove completely unused layoutManagerDelegate things (#2189)

Browse Source
This commit is contained in:
Adlai Holler
2016-09-04 12:01:42 -07:00
committed by GitHub
parent 4dd5189f6c
commit 90c59e0de7
7 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AsyncDisplayKit/ASTextNode.mm
View File

@@ -40,7 +40,7 @@ struct ASTextNodeDrawParameter {
UIColor *backgroundColor;
};
@interface ASTextNode () <UIGestureRecognizerDelegate, NSLayoutManagerDelegate>
@interface ASTextNode () <UIGestureRecognizerDelegate>
@end

6
AsyncDisplayKit/TextKit/ASTextKitAttributes.h
View File

@@ -82,11 +82,6 @@ struct ASTextKitAttributes {
*/
NSArray *pointSizeScaleFactors;
/**
An optional delegate for the NSLayoutManager
*/
id<NSLayoutManagerDelegate> layoutManagerDelegate;
/**
We provide an explicit copy function so we can use aggregate initializer syntax while providing copy semantics for
the NSObjects inside.
@@ -105,7 +100,6 @@ struct ASTextKitAttributes {
shadowOpacity,
shadowRadius,
pointSizeScaleFactors,
layoutManagerDelegate,
};
};

3
AsyncDisplayKit/TextKit/ASTextKitContext.h
View File

@@ -27,8 +27,7 @@
lineBreakMode:(NSLineBreakMode)lineBreakMode
maximumNumberOfLines:(NSUInteger)maximumNumberOfLines
exclusionPaths:(NSArray *)exclusionPaths
constrainedSize:(CGSize)constrainedSize
layoutManagerDelegate:(id<NSLayoutManagerDelegate>)layoutManagerDelegate;
constrainedSize:(CGSize)constrainedSize;
@property (nonatomic, assign, readwrite) CGSize constrainedSize;

2
AsyncDisplayKit/TextKit/ASTextKitContext.mm
View File

@@ -29,7 +29,6 @@
maximumNumberOfLines:(NSUInteger)maximumNumberOfLines
exclusionPaths:(NSArray *)exclusionPaths
constrainedSize:(CGSize)constrainedSize
layoutManagerDelegate:(id<NSLayoutManagerDelegate>)layoutManagerDelegate
{
if (self = [super init]) {
@@ -43,7 +42,6 @@
_textStorage = (attributedString ? [[NSTextStorage alloc] initWithAttributedString:attributedString] : [[NSTextStorage alloc] init]);
_layoutManager = [[ASLayoutManager alloc] init];
_layoutManager.usesFontLeading = NO;
_layoutManager.delegate = layoutManagerDelegate;
[_textStorage addLayoutManager:_layoutManager];
_textContainer = [[NSTextContainer alloc] initWithSize:constrainedSize];
// We want the text laid out up to the very edges of the container.

3
AsyncDisplayKit/TextKit/ASTextKitRenderer.mm
View File

@@ -100,8 +100,7 @@ static NSCharacterSet *_defaultAvoidTruncationCharacterSet()
lineBreakMode:attributes.lineBreakMode
maximumNumberOfLines:attributes.maximumNumberOfLines
exclusionPaths:attributes.exclusionPaths
constrainedSize:shadowConstrainedSize
layoutManagerDelegate:attributes.layoutManagerDelegate];
constrainedSize:shadowConstrainedSize];
}
return _context;
}

3
AsyncDisplayKit/TextKit/ASTextKitTailTruncater.mm
View File

@@ -66,8 +66,7 @@
lineBreakMode:NSLineBreakByWordWrapping
maximumNumberOfLines:1
exclusionPaths:nil
constrainedSize:constrainedRect.size
layoutManagerDelegate:nil];
constrainedSize:constrainedRect.size];
__block CGRect truncationUsedRect;
[truncationContext performBlockWithLockedTextKitComponents:^(NSLayoutManager *truncationLayoutManager, NSTextStorage *truncationTextStorage, NSTextContainer *truncationTextContainer) {

18
AsyncDisplayKitTests/ASTextKitTruncationTests.mm
View File

@@ -43,8 +43,7 @@
lineBreakMode:NSLineBreakByWordWrapping
maximumNumberOfLines:0
exclusionPaths:nil
constrainedSize:constrainedSize
layoutManagerDelegate:nil];
constrainedSize:constrainedSize];
__block NSRange textKitVisibleRange;
[context performBlockWithLockedTextKitComponents:^(NSLayoutManager *layoutManager, NSTextStorage *textStorage, NSTextContainer *textContainer) {
textKitVisibleRange = [layoutManager characterRangeForGlyphRange:[layoutManager glyphRangeForTextContainer:textContainer]
@@ -66,8 +65,7 @@
lineBreakMode:NSLineBreakByWordWrapping
maximumNumberOfLines:0
exclusionPaths:nil
constrainedSize:constrainedSize
layoutManagerDelegate:nil];
constrainedSize:constrainedSize];
ASTextKitTailTruncater *tailTruncater = [[ASTextKitTailTruncater alloc] initWithContext:context
truncationAttributedString:[self _simpleTruncationAttributedString]
avoidTailTruncationSet:[NSCharacterSet characterSetWithCharactersInString:@""]];
@@ -90,8 +88,7 @@
lineBreakMode:NSLineBreakByWordWrapping
maximumNumberOfLines:0
exclusionPaths:nil
constrainedSize:constrainedSize
layoutManagerDelegate:nil];
constrainedSize:constrainedSize];
ASTextKitTailTruncater *tailTruncater = [[ASTextKitTailTruncater alloc] initWithContext:context
truncationAttributedString:[self _simpleTruncationAttributedString]
avoidTailTruncationSet:[NSCharacterSet characterSetWithCharactersInString:@"."]];
@@ -113,8 +110,7 @@
lineBreakMode:NSLineBreakByCharWrapping
maximumNumberOfLines:0
exclusionPaths:nil
constrainedSize:constrainedSize
layoutManagerDelegate:nil];
constrainedSize:constrainedSize];
ASTextKitTailTruncater *tailTruncater = [[ASTextKitTailTruncater alloc] initWithContext:context
truncationAttributedString:[self _simpleTruncationAttributedString]
avoidTailTruncationSet:[NSCharacterSet characterSetWithCharactersInString:@"."]];
@@ -137,8 +133,7 @@
lineBreakMode:NSLineBreakByWordWrapping
maximumNumberOfLines:0
exclusionPaths:nil
constrainedSize:constrainedSize
layoutManagerDelegate:nil];
constrainedSize:constrainedSize];
ASTextKitTailTruncater *tailTruncater = [[ASTextKitTailTruncater alloc] initWithContext:context
truncationAttributedString:[self _simpleTruncationAttributedString]
avoidTailTruncationSet:nil];
@@ -155,8 +150,7 @@
lineBreakMode:NSLineBreakByCharWrapping
maximumNumberOfLines:0
exclusionPaths:nil
constrainedSize:constrainedSize
layoutManagerDelegate:nil];
constrainedSize:constrainedSize];
ASTextKitTailTruncater *tailTruncater = [[ASTextKitTailTruncater alloc] initWithContext:context
truncationAttributedString:[self _simpleTruncationAttributedString]