dia r4199 - in trunk: . objects/UML

[hans svn gnome org]

Author: hans
Date: Sat Jan 17 17:01:58 2009
New Revision: 4199
URL: http://svn.gnome.org/viewvc/dia?rev=4199&view=rev

Log:
2009-01-17  Hans Breuer  <hans breuer org>

	* objects/UML/node.c objects/UML/object.c : text tinting was missing
	for string or underline (bug #568009)



Modified:
   trunk/ChangeLog
   trunk/objects/UML/node.c
   trunk/objects/UML/object.c

Modified: trunk/objects/UML/node.c
==============================================================================
--- trunk/objects/UML/node.c	(original)
+++ trunk/objects/UML/node.c	Sat Jan 17 17:01:58 2009
@@ -283,7 +283,7 @@
   for (i = 0; i < node->name->numlines; i++)
     { 
       points[1].x = points[0].x + text_get_line_width(node->name, i);
-      renderer_ops->draw_line(renderer, points, points + 1, &color_black);
+      renderer_ops->draw_line(renderer, points, points + 1, &node->attrs.color);
       points[0].y = points[1].y += node->name->height;
     }
 }

Modified: trunk/objects/UML/object.c
==============================================================================
--- trunk/objects/UML/object.c	(original)
+++ trunk/objects/UML/object.c	Sat Jan 17 17:01:58 2009
@@ -208,6 +208,8 @@
   object_set_props_from_offsets(&objet->element.object,
                                 objet_offsets,props);
   apply_textstr_properties(props,objet->attributes,"attrib",objet->attrib);
+  /* also update our text object with the new color */
+  text_set_color(objet->text, &objet->text_color);
   g_free(objet->st_stereotype);
   objet->st_stereotype = NULL;
   objet_update_data(objet);