oops. edje text format cache didnt take into account alignment... fix.

SVN revision: 12039

diff --git a/legacy/edje/src/lib/Edje_Edit.h b/legacy/edje/src/lib/Edje_Edit.h
index 4528e56..15859ad 100644 (file)
--- a/legacy/edje/src/lib/Edje_Edit.h
+++ b/legacy/edje/src/lib/Edje_Edit.h
@@ -520,6 +520,7 @@ struct _Edje_Real_Part
         char               *in_str;
         char               *out_str;
         int                 out_size;
+        double              align_x, align_y;
       } cache;
       Edje_Real_Part        *source;
       Edje_Real_Part        *text_source;

diff --git a/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c
index 4627be0..05b7dcf 100644 (file)
--- a/legacy/edje/src/lib/edje_calc.c
+++ b/legacy/edje/src/lib/edje_calc.c
@@ -951,7 +951,6 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags)
 
        p3.text.align.x = (p1.text.align.x * (1.0 - pos)) + (p2.text.align.x * (pos));
        p3.text.align.y = (p1.text.align.y * (1.0 - pos)) + (p2.text.align.y * (pos));
-       
      }
    else
      {

diff --git a/legacy/edje/src/lib/edje_text.c b/legacy/edje/src/lib/edje_text.c
index 6ab67f6..b28263d 100644 (file)
--- a/legacy/edje/src/lib/edje_text.c
+++ b/legacy/edje/src/lib/edje_text.c
@@ -348,8 +348,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
        (ep->text.cache.in_str) &&
        (text) &&
        (!strcmp(ep->text.cache.in_str, text)) &&
-       (chosen_desc->text.align.x == params->text.align.x) &&
-       (chosen_desc->text.align.y == params->text.align.y))
+       (ep->text.cache.align_x == params->text.align.x) &&
+       (ep->text.cache.align_y == params->text.align.y))
      {
        text = ep->text.cache.out_str;
        size = ep->text.cache.out_size;
@@ -583,7 +583,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
    ep->text.cache.in_w = sw;
    ep->text.cache.in_h = sh;
    ep->text.cache.out_size = size;
-   
+   ep->text.cache.align_x = params->text.align.x;
+   ep->text.cache.align_y = params->text.align.y;
    arrange_text:
    
    if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);