Author: ericwa
Date: Sat Mar 22 23:34:10 2014
New Revision: 10613
URL: http://svn.gna.org/viewcvs/etoile?rev=10613&view=rev
Log:
COAttributedString: support text color
Modified:
trunk/Etoile/Frameworks/CoreObject/Extras/Model/COAttributedStringWrapper.m
Modified:
trunk/Etoile/Frameworks/CoreObject/Extras/Model/COAttributedStringWrapper.m
URL:
http://svn.gna.org/viewcvs/etoile/trunk/Etoile/Frameworks/CoreObject/Extras/Model/COAttributedStringWrapper.m?rev=10613&r1=10612&r2=10613&view=diff
==============================================================================
--- trunk/Etoile/Frameworks/CoreObject/Extras/Model/COAttributedStringWrapper.m
(original)
+++ trunk/Etoile/Frameworks/CoreObject/Extras/Model/COAttributedStringWrapper.m
Sat Mar 22 23:34:10 2014
@@ -398,6 +398,14 @@
{
result[NSStrikethroughStyleAttributeName] =
@(NSUnderlineStyleSingle);
}
+ if ([attr.styleKey isEqualToString: @"color"])
+ {
+ NSColor *color = [[NSValueTransformer
valueTransformerForName: @"COColorToHTMLString"] reverseTransformedValue:
attr.styleValue];
+ if (color != nil)
+ {
+ result[NSForegroundColorAttributeName]
= color;
+ }
+ }
}
result[NSFontAttributeName] = font;
@@ -529,7 +537,11 @@
}
else if ([attributeName isEqual:
NSForegroundColorAttributeName])
{
-
+ NSString *colorString = [[NSValueTransformer
valueTransformerForName: @"COColorToHTMLString"] transformedValue:
attributeValue];
+ if (colorString != nil)
+ {
+ [newAttribs addObject: [self makeAttr: @"color"
value: colorString]];
+ }
}
}
_______________________________________________
Etoile-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/etoile-cvs
