summaryrefslogtreecommitdiff
path: root/legacy/edje/src/lib/edje_text.c
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2007-10-14 23:54:27 +0000
committerCarsten Haitzler <raster@rasterman.com>2007-10-14 23:54:27 +0000
commit412d44f90f18fa773f2a7a7a9110a3554d6019d6 (patch)
treec7edde60bdb1cda12cde12d779ab10f90280ccf5 /legacy/edje/src/lib/edje_text.c
parent8108d0e8d6897b27055339161ec63753ec564c04 (diff)
bizarre - text sources were broken - but never appeared in e - somehow they
worked. fixed. SVN revision: 32078
Diffstat (limited to 'legacy/edje/src/lib/edje_text.c')
-rw-r--r--legacy/edje/src/lib/edje_text.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/legacy/edje/src/lib/edje_text.c b/legacy/edje/src/lib/edje_text.c
index c8ddb7c..87f75e8 100644
--- a/legacy/edje/src/lib/edje_text.c
+++ b/legacy/edje/src/lib/edje_text.c
@@ -341,13 +341,26 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
341 if (ep->text.font) font = ep->text.font; 341 if (ep->text.font) font = ep->text.font;
342 if (ep->text.size > 0) size = ep->text.size; 342 if (ep->text.size > 0) size = ep->text.size;
343 343
344 if (ep->text.text_source)
345 {
346 text = ep->text.text_source->chosen_description->text.text;
347 if (ep->text.text_source->text.text) text = ep->text.text_source->text.text;
348 }
349 if (ep->text.source)
350 {
351 font = ep->text.source->chosen_description->text.font;
352 size = ep->text.source->chosen_description->text.size;
353 if (ep->text.source->text.font) font = ep->text.source->text.font;
354 if (ep->text.source->text.size > 0) size = ep->text.source->text.size;
355 }
356
344 if (!text) text = ""; 357 if (!text) text = "";
345 if (!font) font = ""; 358 if (!font) font = "";
346 359
347 /* check if the font is embedded in the .eet */ 360 /* check if the font is embedded in the .eet */
348 if (ed->file->font_hash) 361 if (ed->file->font_hash)
349 { 362 {
350 Edje_Font_Directory_Entry *fnt = evas_hash_find (ed->file->font_hash, font); 363 Edje_Font_Directory_Entry *fnt = evas_hash_find(ed->file->font_hash, font);
351 364
352 if (fnt) 365 if (fnt)
353 { 366 {
@@ -386,7 +399,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
386 (ep->text.cache.fit_x == chosen_desc->text.fit_x) && 399 (ep->text.cache.fit_x == chosen_desc->text.fit_x) &&
387 (ep->text.cache.fit_y == chosen_desc->text.fit_y)) 400 (ep->text.cache.fit_y == chosen_desc->text.fit_y))
388 { 401 {
389 text = (char *) ep->text.cache.out_str; 402 text = (char *)ep->text.cache.out_str;
390 size = ep->text.cache.out_size; 403 size = ep->text.cache.out_size;
391 404
392 if (!text) text = ""; 405 if (!text) text = "";