E CVS: libs/edje raster

[Enlightenment C. <no...@cv...>]

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/edje

Dir     : e17/libs/edje/src/lib


Modified Files:
	edje_calc.c edje_text.c 


Log Message:


bizarre - text sources were broken - but never appeared in e - somehow they
worked. fixed.

===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -3 -r1.111 -r1.112
--- edje_calc.c	9 Oct 2007 15:30:26 -0000	1.111
+++ edje_calc.c	14 Oct 2007 23:54:27 -0000	1.112
@@ -728,6 +728,7 @@
 	  {
 	     if (ep->text.text) text = ep->text.text;
 	  }
+	
 	if (ep->text.source)
 	  {
 	     if (ep->text.source->text.font) font = ep->text.source->text.font;
@@ -1182,6 +1183,8 @@
 	if (ep->param2.rel2_to_y)  _edje_part_recalc(ed, ep->param2.rel2_to_y, FLAG_Y);
      }
    if (ep->confine_to)        _edje_part_recalc(ed, ep->confine_to, flags);
+//   if (ep->text.source)       _edje_part_recalc(ed, ep->text.source, flags);
+//   if (ep->text.text_source)  _edje_part_recalc(ed, ep->text.text_source, flags);
 
    /* actually calculate now */
    chosen_desc = ep->chosen_description;
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_text.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- edje_text.c	17 Sep 2007 05:07:35 -0000	1.66
+++ edje_text.c	14 Oct 2007 23:54:27 -0000	1.67
@@ -341,13 +341,26 @@
    if (ep->text.font) font = ep->text.font;
    if (ep->text.size > 0) size = ep->text.size;
 
+   if (ep->text.text_source)
+     {
+	text = ep->text.text_source->chosen_description->text.text;
+	if (ep->text.text_source->text.text) text = ep->text.text_source->text.text;
+     }
+   if (ep->text.source)
+     {
+	font = ep->text.source->chosen_description->text.font;
+	size = ep->text.source->chosen_description->text.size;
+	if (ep->text.source->text.font) font = ep->text.source->text.font;
+	if (ep->text.source->text.size > 0) size = ep->text.source->text.size;
+     }
+   
    if (!text) text = "";
    if (!font) font = "";
 
    /* check if the font is embedded in the .eet */
    if (ed->file->font_hash)
      {
-	Edje_Font_Directory_Entry *fnt = evas_hash_find (ed->file->font_hash, font);
+	Edje_Font_Directory_Entry *fnt = evas_hash_find(ed->file->font_hash, font);
 
 	if (fnt)
 	  {
@@ -386,7 +399,7 @@
        (ep->text.cache.fit_x == chosen_desc->text.fit_x) &&
        (ep->text.cache.fit_y == chosen_desc->text.fit_y))
      {
-	text = (char *) ep->text.cache.out_str;
+	text = (char *)ep->text.cache.out_str;
 	size = ep->text.cache.out_size;
 
 	if (!text) text = "";