Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
Edje_Edit.h edje_calc.c edje_text.c
Log Message:
oops. edje text format cache didnt take into account alignment... fix.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/Edje_Edit.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- Edje_Edit.h 13 Oct 2004 03:43:42 -0000 1.17
+++ Edje_Edit.h 27 Oct 2004 06:07:50 -0000 1.18
@@ -520,6 +520,7 @@
char *in_str;
char *out_str;
int out_size;
+ double align_x, align_y;
} cache;
Edje_Real_Part *source;
Edje_Real_Part *text_source;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- edje_calc.c 22 Oct 2004 07:42:37 -0000 1.43
+++ edje_calc.c 27 Oct 2004 06:07:50 -0000 1.44
@@ -951,7 +951,6 @@
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
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_text.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- edje_text.c 20 Oct 2004 06:25:43 -0000 1.21
+++ edje_text.c 27 Oct 2004 06:07:50 -0000 1.22
@@ -348,8 +348,8 @@
(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 @@
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);
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
