Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #698 from Akylas/default_color

if no color set, use kCTForegroundColorFromContextAttributeName
  • Loading branch information...
commit 5499d4710869ae7925bfbbdf3d4d720e38825405 2 parents 2a469b9 + 7d60edc
@Cocoanetics authored
View
5 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)
{
View
3  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)
{
Please sign in to comment.
Something went wrong with that request. Please try again.