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

Convert ASTextKitComponents to an object.

Browse Source 
ARC doesn't play nicely with structs that contain references to
Objective-C objects, which causes breakage when using AsyncDisplayKit as
a dynamic framework (e.g., with CocoaPods 0.36+).  Fixes #198.
This commit is contained in:
Nadine Salter
2015-01-25 15:18:21 -08:00
parent 9cf71828ad
commit 35d7f43fb6
5 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AsyncDisplayKit/ASEditableTextNode.mm
View File

@@ -49,8 +49,8 @@
// TextKit.
ASDN::RecursiveMutex _textKitLock;
ASTextKitComponents _textKitComponents;
ASTextKitComponents _placeholderTextKitComponents;
ASTextKitComponents *_textKitComponents;
ASTextKitComponents *_placeholderTextKitComponents;
// Forwards NSLayoutManagerDelegate methods related to word kerning
ASTextNodeWordKerner *_wordKerner;
@@ -133,7 +133,7 @@
- (CGSize)calculateSizeThatFits:(CGSize)constrainedSize
{
ASTextKitComponents displayedComponents = [self isDisplayingPlaceholder] ? _placeholderTextKitComponents : _textKitComponents;
ASTextKitComponents *displayedComponents = [self isDisplayingPlaceholder] ? _placeholderTextKitComponents : _textKitComponents;
CGSize textSize = ASTextKitComponentsSizeForConstrainedWidth(displayedComponents, constrainedSize.width);
return CGSizeMake(constrainedSize.width, fminf(textSize.height, constrainedSize.height));
}

2
AsyncDisplayKit/Details/ASTextNodeRenderer.mm
View File

@@ -505,7 +505,7 @@ static const CGFloat ASTextNodeRendererTextCapHeightPadding = 1.3;
CGRect lastLineRect = [_layoutManager lineFragmentRectForGlyphAtIndex:lastVisibleGlyphIndex effectiveRange:NULL];
// Calculate the bounding rectangle for the truncation message
ASTextKitComponents truncationComponents = ASTextKitComponentsCreate(_truncationString, constrainedRect.size);
ASTextKitComponents *truncationComponents = ASTextKitComponentsCreate(_truncationString, constrainedRect.size);
// Size the truncation message
[truncationComponents.layoutManager ensureLayoutForTextContainer:truncationComponents.textContainer];

18
AsyncDisplayKit/Details/ASTextNodeTextKitHelpers.h
View File

@@ -11,12 +11,14 @@
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
typedef struct {
NSTextStorage *textStorage;
NSTextContainer *textContainer;
NSLayoutManager *layoutManager;
UITextView *textView;
} ASTextKitComponents;
@interface ASTextKitComponents : NSObject
@property (nonatomic, strong) NSTextStorage *textStorage;
@property (nonatomic, strong) NSTextContainer *textContainer;
@property (nonatomic, strong) NSLayoutManager *layoutManager;
@property (nonatomic, strong) UITextView *textView;
@end
// Convenience.
/**
@@ -26,11 +28,11 @@ typedef struct {
@return A `ASTextKitComponents` containing the created components. The text view component will be nil.
@discussion The returned components will be hooked up together, so they are ready for use as a system upon return.
*/
extern ASTextKitComponents ASTextKitComponentsCreate(NSAttributedString *attributedSeedString, CGSize textContainerSize);
extern ASTextKitComponents *ASTextKitComponentsCreate(NSAttributedString *attributedSeedString, CGSize textContainerSize);
/**
@abstract Returns the bounding size for the text view's text.
@param components The TextKit components to calculate the constrained size of the text for.
@param constrainedWidth The constraining width to be used during text-sizing. Usually, this value should be the receiver's calculated size.
@result A CGSize representing the bounding size for the receiver's text.
*/
extern CGSize ASTextKitComponentsSizeForConstrainedWidth(ASTextKitComponents components, CGFloat constrainedWidth);
extern CGSize ASTextKitComponentsSizeForConstrainedWidth(ASTextKitComponents *components, CGFloat constrainedWidth);

10
AsyncDisplayKit/Details/ASTextNodeTextKitHelpers.mm
View File

@@ -8,9 +8,13 @@
#import "ASTextNodeTextKitHelpers.h"
@implementation ASTextKitComponents
@end
#pragma mark - Convenience
CGSize ASTextKitComponentsSizeForConstrainedWidth(ASTextKitComponents components, CGFloat constrainedWidth)
CGSize ASTextKitComponentsSizeForConstrainedWidth(ASTextKitComponents *components, CGFloat constrainedWidth)
{
// If our text-view's width is already the constrained width, we can use our existing TextKit stack for this sizing calculation.
// Otherwise, we create a temporary stack to size for `constrainedWidth`.
@@ -25,9 +29,9 @@ CGSize ASTextKitComponentsSizeForConstrainedWidth(ASTextKitComponents components
return textSize;
}
ASTextKitComponents ASTextKitComponentsCreate(NSAttributedString *attributedSeedString, CGSize textContainerSize)
ASTextKitComponents *ASTextKitComponentsCreate(NSAttributedString *attributedSeedString, CGSize textContainerSize)
{
ASTextKitComponents components;
ASTextKitComponents *components = [[ASTextKitComponents alloc] init];
// Create the TextKit component stack with our default configuration.
components.textStorage = (attributedSeedString ? [[NSTextStorage alloc] initWithAttributedString:attributedSeedString] : [[NSTextStorage alloc] init]);

2
AsyncDisplayKitTests/ASTextNodeWordKernerTests.mm
View File

@@ -17,7 +17,7 @@
@interface ASTextNodeWordKernerTests : XCTestCase
@property (nonatomic, readwrite, strong) ASTextNodeWordKerner *layoutManagerDelegate;
@property (nonatomic, readwrite, assign) ASTextKitComponents components;
@property (nonatomic, readwrite, assign) ASTextKitComponents *components;
@property (nonatomic, readwrite, copy) NSAttributedString *attributedString;
@end