Merge f215d1d into 07149ac

Cocoanetics · Jan 29, 2015 · 89517f0 · 89517f0
2 parents 07149ac + f215d1d
commit 89517f0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Core/Source/DTAttributedTextContentView.m b/Core/Source/DTAttributedTextContentView.m
@@ -426,8 +426,6 @@ - (void)layoutSubviewsInRect:(CGRect)rect
 
 - (void)layoutSubviews
 {
-	[super layoutSubviews];
-
 	if (!_isTiling && (self.bounds.size.width>1024.0 || self.bounds.size.height>1024.0))
 	{
 		if (![self.layer isKindOfClass:[CATiledLayer class]])
@@ -440,6 +438,8 @@ - (void)layoutSubviews
 	{
 		[self layoutSubviewsInRect:CGRectInfinite];
 	}
+
+    [super layoutSubviews];
 }
 
 - (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)ctx

diff --git a/Core/Source/DTAttributedTextView.m b/Core/Source/DTAttributedTextView.m
@@ -53,12 +53,12 @@ - (void)dealloc
 
 - (void)layoutSubviews
 {
-	[super layoutSubviews];
-
 	[self attributedTextContentView];
 
 	// layout custom subviews for visible area
 	[_attributedTextContentView layoutSubviewsInRect:self.bounds];
+
+  [super layoutSubviews];
 }
 
 - (void)awakeFromNib