Author: fejj
Date: 2008-02-07 12:47:32 -0500 (Thu, 07 Feb 2008)
New Revision: 95168
Modified:
trunk/moon/src/ChangeLog
trunk/moon/src/xaml.cpp
Log:
2008-02-07 Jeffrey Stedfast <[EMAIL PROTECTED]>
Fixes a rendering glitch for xaml similar to:
<TextBlock>
<Run FontStyle="Italic">This </Run>is Dodger Blue
</TextBlock>
* xaml.cpp (flush_char_data): Don't g_strchomp() the cdata when
setting the value of a content_property (e.g. a Run).
Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog 2008-02-07 17:44:39 UTC (rev 95167)
+++ trunk/moon/src/ChangeLog 2008-02-07 17:47:32 UTC (rev 95168)
@@ -1,3 +1,14 @@
+2008-02-07 Jeffrey Stedfast <[EMAIL PROTECTED]>
+
+ Fixes a rendering glitch for xaml similar to:
+
+ <TextBlock>
+ <Run FontStyle="Italic">This </Run>is Dodger Blue
+ </TextBlock>
+
+ * xaml.cpp (flush_char_data): Don't g_strchomp() the cdata when
+ setting the value of a content_property (e.g. a Run).
+
2008-02-07 Michael Dominic K. <[EMAIL PROTECTED]>
* src/color.cpp: Added support to parse scRGB-style color specificators
Modified: trunk/moon/src/xaml.cpp
===================================================================
--- trunk/moon/src/xaml.cpp 2008-02-07 17:44:39 UTC (rev 95167)
+++ trunk/moon/src/xaml.cpp 2008-02-07 17:47:32 UTC (rev 95168)
@@ -920,7 +920,7 @@
// and use that code
if ((content->value_type) == Type::STRING && p->cdata) {
- g_strchomp (p->cdata->str);
+ // Note: Do NOT g_strchomp() here in at least the case of a
<Run> element...
p->current_element->item->SetValue (content, Value
(p->cdata->str));
} else if (p->current_element->item && is_instance_of
(p->current_element, Type::TEXTBLOCK)) {
Inlines *inlines = text_block_get_inlines ((TextBlock *)
p->current_element->item);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches