bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

SVN revision: 12039
This commit is contained in:
Carsten Haitzler 2004-10-27 06:07:50 +00:00
parent 1ba9deec38
commit cbc6f32c54
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/edje/src/lib/Edje_Edit.h
View File

@ -520,6 +520,7 @@ struct _Edje_Real_Part
char *in_str; char *in_str;
char *out_str; char *out_str;
int out_size; int out_size;
double align_x, align_y;
} cache; } cache;
Edje_Real_Part *source; Edje_Real_Part *source;
Edje_Real_Part *text_source; Edje_Real_Part *text_source;

1
legacy/edje/src/lib/edje_calc.c
View File

@ -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.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)); p3.text.align.y = (p1.text.align.y * (1.0 - pos)) + (p2.text.align.y * (pos));
} }
else else
{ {

7
legacy/edje/src/lib/edje_text.c
View File

@ -348,8 +348,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
(ep->text.cache.in_str) && (ep->text.cache.in_str) &&
(text) && (text) &&
(!strcmp(ep->text.cache.in_str, text)) && (!strcmp(ep->text.cache.in_str, text)) &&
(chosen_desc->text.align.x == params->text.align.x) && (ep->text.cache.align_x == params->text.align.x) &&
(chosen_desc->text.align.y == params->text.align.y)) (ep->text.cache.align_y == params->text.align.y))
{ {
text = ep->text.cache.out_str; text = ep->text.cache.out_str;
size = ep->text.cache.out_size; 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_w = sw;
ep->text.cache.in_h = sh; ep->text.cache.in_h = sh;
ep->text.cache.out_size = size; 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: arrange_text:
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path); if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);