Merge pull request facebookarchive#467 from rogchap/fix-ttsyledtextla…

…bel-alignment Implemented support for UITextAlignment to TTStyledTextLabel - closes #101
bygreencn · Jul 10, 2011 · c78fc97 · c78fc97
2 parents 48af7a1 + 15311f7
commit c78fc97
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 1 deletion.
diff --git a/samples/TTCatalog/Classes/StyledTextTestController.m b/samples/TTCatalog/Classes/StyledTextTestController.m
@@ -114,6 +114,7 @@ - (void)loadView {
   label1.text = [TTStyledText textFromXHTML:kText lineBreaks:YES URLs:YES];
   label1.contentInset = UIEdgeInsetsMake(10, 10, 10, 10);
   //label1.backgroundColor = [UIColor grayColor];
+  //label1.textAlignment = UITextAlignmentCenter;
   [label1 sizeToFit];
   [self.view addSubview:label1];
 }

diff --git a/src/Three20Style/Headers/TTStyledLayout.h b/src/Three20Style/Headers/TTStyledLayout.h
@@ -45,6 +45,8 @@
   UIFont* _boldFont;
   UIFont* _italicFont;
 
+  UITextAlignment _textAlignment;
+
   TTStyle*      _linkStyle;
   TTStyledNode* _rootNode;
   TTStyledNode* _lastNode;
@@ -55,6 +57,7 @@
 @property (nonatomic)           CGFloat         width;
 @property (nonatomic)           CGFloat         height;
 @property (nonatomic, retain)   UIFont*         font;
+@property (nonatomic)           UITextAlignment textAlignment;
 @property (nonatomic, readonly) TTStyledFrame*  rootFrame;
 @property (nonatomic, retain)   NSMutableArray* invalidImages;
 

diff --git a/src/Three20Style/Headers/TTStyledText.h b/src/Three20Style/Headers/TTStyledText.h
@@ -28,6 +28,7 @@
   TTStyledNode*   _rootNode;
   TTStyledFrame*  _rootFrame;
   UIFont*         _font;
+  UITextAlignment _textAlignment;
   CGFloat         _width;
   CGFloat         _height;
   NSMutableArray* _invalidImages;
@@ -53,6 +54,11 @@
  */
 @property (nonatomic, retain) UIFont* font;
 
+/**
+ * The text alignment used for all text.
+ */
+@property (nonatomic) UITextAlignment textAlignment;
+
 /**
  * The width that the text should be constrained to fit within.
  */

diff --git a/src/Three20Style/Sources/TTStyledLayout.m b/src/Three20Style/Sources/TTStyledLayout.m
@@ -51,6 +51,7 @@ @implementation TTStyledLayout
 @synthesize height        = _height;
 @synthesize rootFrame     = _rootFrame;
 @synthesize font          = _font;
+@synthesize textAlignment = _textAlignment;
 @synthesize invalidImages = _invalidImages;
 
 
@@ -177,6 +178,20 @@ - (void)offsetFrame:(TTStyledFrame*)frame by:(CGFloat)y {
   }
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (void)offsetFrame:(TTStyledFrame*)frame byX:(CGFloat)x {
+  frame.x += x;
+
+  if ([frame isKindOfClass:[TTStyledInlineFrame class]]) {
+    TTStyledInlineFrame* inlineFrame = (TTStyledInlineFrame*)frame;
+    TTStyledFrame* child = inlineFrame.firstChildFrame;
+    while (child) {
+      [self offsetFrame:child byX:x];
+      child = child.nextFrame;
+    }
+  }
+}
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 - (void)expandLineWidth:(CGFloat)width {
@@ -366,6 +381,18 @@ - (void)breakLine {
     }
   }
 
+  // Horizontally align all frames on current line if required
+  if (_textAlignment != UITextAlignmentLeft) {
+    CGFloat remainingSpace = _width - _lineWidth;
+    CGFloat offset = _textAlignment == UITextAlignmentCenter ? remainingSpace/2 : remainingSpace;
+
+    TTStyledFrame* frame = _lineFirstFrame;
+    while (frame) {
+      [self offsetFrame:frame byX:offset];
+      frame = frame.nextFrame;
+    }
+  }
+
   _height += _lineHeight;
   [self checkFloats];
 

diff --git a/src/Three20Style/Sources/TTStyledText.m b/src/Three20Style/Sources/TTStyledText.m
@@ -57,6 +57,7 @@ @implementation TTStyledText
 
 @synthesize rootNode      = _rootNode;
 @synthesize font          = _font;
+@synthesize textAlignment = _textAlignment;
 @synthesize width         = _width;
 @synthesize height        = _height;
 @synthesize invalidImages = _invalidImages;
@@ -299,6 +300,14 @@ - (void)setFont:(UIFont*)font {
   }
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (void)setTextAlignment:(UITextAlignment)textAlignment {
+  if (textAlignment != _textAlignment) {
+    _textAlignment = textAlignment;
+    [self setNeedsLayout];
+  }
+}
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 - (void)setWidth:(CGFloat)width {
@@ -327,6 +336,7 @@ - (void)layoutFrames {
   TTStyledLayout* layout = [[TTStyledLayout alloc] initWithRootNode:_rootNode];
   layout.width = _width;
   layout.font = _font;
+  layout.textAlignment = _textAlignment;
   [layout layout:_rootNode];
 
   [_rootFrame release];

diff --git a/src/Three20UI/Headers/TTStyledTextLabel.h b/src/Three20UI/Headers/TTStyledTextLabel.h
@@ -68,7 +68,7 @@
 @property (nonatomic, retain) UIColor* highlightedTextColor;
 
 /**
- * The alignment of the text. (NOT YET IMPLEMENTED)
+ * The alignment of the text.
  */
 @property (nonatomic) UITextAlignment textAlignment;
 

diff --git a/src/Three20UI/Sources/TTStyledTextLabel.m b/src/Three20UI/Sources/TTStyledTextLabel.m
@@ -454,6 +454,7 @@ - (void)setText:(TTStyledText*)text {
     _text = [text retain];
     _text.delegate = self;
     _text.font = _font;
+    _text.textAlignment = _textAlignment;
     [self setNeedsLayout];
     [self setNeedsDisplay];
   }
@@ -482,6 +483,14 @@ - (void)setFont:(UIFont*)font {
   }
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (void)setTextAlignment:(UITextAlignment)textAlignment {
+  if (textAlignment != _textAlignment) {
+    _textAlignment = textAlignment;
+    _text.textAlignment = _textAlignment;
+    [self setNeedsLayout];
+  }
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 - (UIColor*)textColor {