mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-12-24 07:05:35 +00:00
A simpler, cleaner implementation
This commit is contained in:
@@ -41,7 +41,6 @@
|
||||
{
|
||||
@private
|
||||
// Configuration.
|
||||
UITextView *_textView;
|
||||
NSDictionary *_typingAttributes;
|
||||
|
||||
// Core.
|
||||
@@ -78,7 +77,6 @@
|
||||
_textKitComponents = [ASTextKitComponents componentsWithAttributedSeedString:nil textContainerSize:CGSizeZero];
|
||||
_textKitComponents.layoutManager.delegate = self;
|
||||
_wordKerner = [[ASTextNodeWordKerner alloc] init];
|
||||
_textView = [[_ASDisabledPanUITextView alloc] initWithFrame:CGRectZero textContainer:_textKitComponents.textContainer];
|
||||
|
||||
// Create the placeholder scaffolding.
|
||||
_placeholderTextKitComponents = [ASTextKitComponents componentsWithAttributedSeedString:nil textContainerSize:CGSizeZero];
|
||||
@@ -135,7 +133,7 @@
|
||||
[self.view addSubview:_placeholderTextKitComponents.textView];
|
||||
|
||||
// Create and configure our text view.
|
||||
_textKitComponents.textView = _textView;
|
||||
_textKitComponents.textView = self.textView;
|
||||
//_textKitComponents.textView = NO; // Unfortunately there's a bug here with iOS 7 DP5 that causes the text-view to only be one line high when scrollEnabled is NO. rdar://14729288
|
||||
_textKitComponents.textView.delegate = self;
|
||||
_textKitComponents.textView.editable = YES;
|
||||
@@ -190,25 +188,15 @@
|
||||
#pragma mark - Configuration
|
||||
@synthesize delegate = _delegate;
|
||||
|
||||
#pragma mark -
|
||||
@dynamic textView;
|
||||
|
||||
- (UITextView *)textView
|
||||
{
|
||||
ASDisplayNodeAssertMainThread();
|
||||
if (!_textView) {
|
||||
_textView = [[_ASDisabledPanUITextView alloc] initWithFrame:CGRectZero textContainer:_textKitComponents.textContainer];
|
||||
if (!_textKitComponents.textView) {
|
||||
_textKitComponents.textView = [[_ASDisabledPanUITextView alloc] initWithFrame:CGRectZero textContainer:_textKitComponents.textContainer];
|
||||
}
|
||||
return _textView;
|
||||
return _textKitComponents.textView;
|
||||
}
|
||||
|
||||
- (void)setTextView:(UITextView *)textView
|
||||
{
|
||||
ASDisplayNodeAssertMainThread();
|
||||
_textView = textView;
|
||||
}
|
||||
|
||||
|
||||
#pragma mark -
|
||||
@dynamic typingAttributes;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user