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; UIColor *backgroundColor;
}; };
@interface ASTextNode () <UIGestureRecognizerDelegate, NSLayoutManagerDelegate> @interface ASTextNode () <UIGestureRecognizerDelegate>
@end @end

6
AsyncDisplayKit/TextKit/ASTextKitAttributes.h
View File

@@ -81,11 +81,6 @@ struct ASTextKitAttributes {
An array of scale factors in descending order to apply to the text to try to make it fit into a constrained size. An array of scale factors in descending order to apply to the text to try to make it fit into a constrained size.
*/ */
NSArray *pointSizeScaleFactors; 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 We provide an explicit copy function so we can use aggregate initializer syntax while providing copy semantics for
@@ -105,7 +100,6 @@ struct ASTextKitAttributes {
shadowOpacity, shadowOpacity,
shadowRadius, shadowRadius,
pointSizeScaleFactors, pointSizeScaleFactors,
layoutManagerDelegate,
}; };
}; };

3
AsyncDisplayKit/TextKit/ASTextKitContext.h
View File

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

2
AsyncDisplayKit/TextKit/ASTextKitContext.mm
View File

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

3
AsyncDisplayKit/TextKit/ASTextKitTailTruncater.mm
View File

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

18
AsyncDisplayKitTests/ASTextKitTruncationTests.mm
View File

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