if no color set, use kCTForegroundColorFromContextAttributeName

Cocoanetics · Jan 6, 2014 · 7d60edc · 7d60edc
1 parent a34d9eb
commit 7d60edc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/Core/Source/DTHTMLAttributedStringBuilder.m b/Core/Source/DTHTMLAttributedStringBuilder.m
@@ -290,11 +290,6 @@ - (BOOL)_buildString
 	_defaultTag.textScale = _textScale;
 	_defaultTag.currentTextSize = _defaultFontDescriptor.pointSize;
 
-#if DTCORETEXT_FIX_14684188
-	// workaround, only necessary while rdar://14684188 is not fixed
-	_defaultTag.textColor = [UIColor blackColor];
-#endif
-
 	id defaultColor = [_options objectForKey:DTDefaultTextColor];
 	if (defaultColor)
 	{

diff --git a/Core/Source/DTHTMLElement.m b/Core/Source/DTHTMLElement.m
@@ -207,6 +207,9 @@ - (NSDictionary *)attributesForAttributedStringRepresentation
 			[tmpDict setObject:(id)[_textColor CGColor] forKey:(id)kCTForegroundColorAttributeName];
 		}
 	}
+	else {
+		[tmpDict setObject:[NSNumber numberWithBool:YES] forKey:(id)kCTForegroundColorFromContextAttributeName];
+	}
 
 	if (_backgroundColor)
 	{