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

Fix missed out Prefix changed in TTTAttributedLabel / BITAttributedLabel

Browse Source
This commit is contained in:
Andreas Linde 2012-11-15 03:24:32 +01:00
parent 4dbbef38e2
commit 89cc537350
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Classes/BITAttributedLabel.h
View File

@ -35,27 +35,27 @@ typedef enum {
/**
Determines whether the text to which this attribute applies has a strikeout drawn through itself.
*/
extern NSString * const kTTTStrikeOutAttributeName;
extern NSString * const kBITStrikeOutAttributeName;
/**
The background fill color. Value must be a `CGColorRef`. Default value is `nil` (no fill).
*/
extern NSString * const kTTTBackgroundFillColorAttributeName;
extern NSString * const kBITBackgroundFillColorAttributeName;
/**
The background stroke color. Value must be a `CGColorRef`. Default value is `nil` (no stroke).
*/
extern NSString * const kTTTBackgroundStrokeColorAttributeName;
extern NSString * const kBITBackgroundStrokeColorAttributeName;
/**
The background stroke line width. Value must be an `NSNumber`. Default value is `1.0f`.
*/
extern NSString * const kTTTBackgroundLineWidthAttributeName;
extern NSString * const kBITBackgroundLineWidthAttributeName;
/**
The background corner radius. Value must be an `NSNumber`. Default value is `5.0f`.
*/
extern NSString * const kTTTBackgroundCornerRadiusAttributeName;
extern NSString * const kBITBackgroundCornerRadiusAttributeName;
@protocol BITAttributedLabelDelegate;

24
Classes/BITAttributedLabel.m
View File

@ -22,16 +22,16 @@
#import "BITAttributedLabel.h"
#define kTTTLineBreakWordWrapTextWidthScalingFactor (M_PI / M_E)
#define kBITLineBreakWordWrapTextWidthScalingFactor (M_PI / M_E)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
NSString * const kTTTStrikeOutAttributeName = @"TTTStrikeOutAttribute";
NSString * const kTTTBackgroundFillColorAttributeName = @"TTTBackgroundFillColor";
NSString * const kTTTBackgroundStrokeColorAttributeName = @"TTTBackgroundStrokeColor";
NSString * const kTTTBackgroundLineWidthAttributeName = @"TTTBackgroundLineWidth";
NSString * const kTTTBackgroundCornerRadiusAttributeName = @"TTTBackgroundCornerRadius";
NSString * const kBITStrikeOutAttributeName = @"BITStrikeOutAttribute";
NSString * const kBITBackgroundFillColorAttributeName = @"BITBackgroundFillColor";
NSString * const kBITBackgroundStrokeColorAttributeName = @"BITBackgroundStrokeColor";
NSString * const kBITBackgroundLineWidthAttributeName = @"BITBackgroundLineWidth";
NSString * const kBITBackgroundCornerRadiusAttributeName = @"BITBackgroundCornerRadius";
static inline CTTextAlignment CTTextAlignmentFromUITextAlignment(UITextAlignment alignment) {
switch (alignment) {
@ -564,10 +564,10 @@ static inline NSAttributedString * NSAttributedStringBySettingColorFromContext(N
for (id glyphRun in (__bridge NSArray *)CTLineGetGlyphRuns((__bridge CTLineRef)line)) {
NSDictionary *attributes = (__bridge NSDictionary *)CTRunGetAttributes((__bridge CTRunRef) glyphRun);
CGColorRef strokeColor = (__bridge CGColorRef)[attributes objectForKey:kTTTBackgroundStrokeColorAttributeName];
CGColorRef fillColor = (__bridge CGColorRef)[attributes objectForKey:kTTTBackgroundFillColorAttributeName];
CGFloat cornerRadius = [[attributes objectForKey:kTTTBackgroundCornerRadiusAttributeName] floatValue];
CGFloat lineWidth = [[attributes objectForKey:kTTTBackgroundLineWidthAttributeName] floatValue];
CGColorRef strokeColor = (__bridge CGColorRef)[attributes objectForKey:kBITBackgroundStrokeColorAttributeName];
CGColorRef fillColor = (__bridge CGColorRef)[attributes objectForKey:kBITBackgroundFillColorAttributeName];
CGFloat cornerRadius = [[attributes objectForKey:kBITBackgroundCornerRadiusAttributeName] floatValue];
CGFloat lineWidth = [[attributes objectForKey:kBITBackgroundLineWidthAttributeName] floatValue];
if (strokeColor || fillColor) {
CGRect runBounds = CGRectZero;
@ -623,7 +623,7 @@ static inline NSAttributedString * NSAttributedStringBySettingColorFromContext(N
for (id glyphRun in (__bridge NSArray *)CTLineGetGlyphRuns((__bridge CTLineRef)line)) {
NSDictionary *attributes = (__bridge NSDictionary *)CTRunGetAttributes((__bridge CTRunRef) glyphRun);
BOOL strikeOut = [[attributes objectForKey:kTTTStrikeOutAttributeName] boolValue];
BOOL strikeOut = [[attributes objectForKey:kBITStrikeOutAttributeName] boolValue];
NSInteger superscriptStyle = [[attributes objectForKey:(id)kCTSuperscriptAttributeName] integerValue];
if (strikeOut) {
@ -788,7 +788,7 @@ static inline NSAttributedString * NSAttributedStringBySettingColorFromContext(N
CGFloat textWidth = [self sizeThatFits:CGSizeZero].width;
CGFloat availableWidth = self.frame.size.width * self.numberOfLines;
if (self.numberOfLines > 1 && self.lineBreakMode == UILineBreakModeWordWrap) {
textWidth *= kTTTLineBreakWordWrapTextWidthScalingFactor;
textWidth *= kBITLineBreakWordWrapTextWidthScalingFactor;
}
if (textWidth > availableWidth && textWidth > 0.0f) {