Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c edje_data.c edje_load.c edje_private.h edje_text.c
Log Message:
Moved the text_class into the description's text section.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- edje_calc.c 30 Oct 2003 04:45:18 -0000 1.20
+++ edje_calc.c 31 Oct 2003 05:07:39 -0000 1.21
@@ -413,11 +413,11 @@
font = chosen_desc->text.font;
size = chosen_desc->text.size;
- if ((ep->part->text_class) && (strlen(ep->part->text_class) > 0))
+ if ((chosen_desc->text.text_class) && (strlen(chosen_desc->text.text_class) >
0))
{
Edje_Text_Class *tc;
- tc = _edje_text_class_find(ed, ep->part->text_class);
+ tc = _edje_text_class_find(ed, chosen_desc->text.text_class);
if (tc->font) font = tc->font;
if (tc->size > 0) size = tc->size;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_data.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- edje_data.c 29 Oct 2003 06:42:03 -0000 1.12
+++ edje_data.c 31 Oct 2003 05:07:39 -0000 1.13
@@ -155,6 +155,7 @@
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "color3.b", color3.b, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "color3.a", color3.a, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "text.text", text.text, EET_T_STRING);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "text.text_class", text.text_class, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "text.font", text.font, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "text.size", text.size, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "text.fit_x", text.fit_x, EET_T_UCHAR);
@@ -173,7 +174,6 @@
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "effect", effect,
EET_T_CHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "mouse_events",
mouse_events, EET_T_CHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "clip_to_id",
clip_to_id, EET_T_INT);
- EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "text_class",
text_class, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_SUB(_edje_edd_edje_part, Edje_Part, "default_desc",
default_desc, _edje_edd_edje_part_description);
EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_part, Edje_Part, "other_desc",
other_desc, _edje_edd_edje_part_description);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "dragable.x",
dragable.x, EET_T_CHAR);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- edje_load.c 29 Oct 2003 06:42:03 -0000 1.30
+++ edje_load.c 31 Oct 2003 05:07:39 -0000 1.31
@@ -574,7 +574,6 @@
ep = ec->parts->data;
ec->parts = evas_list_remove(ec->parts, ep);
if (ep->name) free(ep->name);
- if (ep->text_class) free(ep->text_class);
if (ep->default_desc)
_edje_collection_free_part_description_free(ep->default_desc);
while (ep->other_desc)
{
@@ -610,6 +609,7 @@
free(pi);
}
if (desc->text.text) free(desc->text.text);
+ if (desc->text.text_class) free(desc->text.text_class);
if (desc->text.font) free(desc->text.font);
if (desc->color_class) free(desc->color_class);
free(desc);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- edje_private.h 30 Oct 2003 04:45:18 -0000 1.48
+++ edje_private.h 31 Oct 2003 05:07:39 -0000 1.49
@@ -235,7 +235,6 @@
unsigned char mouse_events; /* it will affect/respond to mouse events */
unsigned char repeat_events; /* it will repeat events to objects below */
int clip_to_id; /* the part id to clip this one to */
- char *text_class; /* how to apply/modify the font */
Edje_Part_Description *default_desc; /* the part descriptor for default */
Evas_List *other_desc; /* other possible descriptors */
struct {
@@ -321,6 +320,7 @@
struct {
char *text; /* if "" or NULL, then leave text unchanged */
+ char *text_class; /* how to apply/modify the font */
char *font; /* if a specific font is asked for */
int size; /* 0 = use user set size */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_text.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edje_text.c 30 Oct 2003 04:45:18 -0000 1.7
+++ edje_text.c 31 Oct 2003 05:07:39 -0000 1.8
@@ -245,11 +245,11 @@
font = chosen_desc->text.font;
size = chosen_desc->text.size;
- if ((ep->part->text_class) && (strlen(ep->part->text_class) > 0))
+ if ((chosen_desc->text.text_class) && (strlen(chosen_desc->text.text_class) > 0))
{
Edje_Text_Class *tc;
- tc = _edje_text_class_find(ed, ep->part->text_class);
+ tc = _edje_text_class_find(ed, chosen_desc->text.text_class);
if (tc->font) font = tc->font;
if (tc->size > 0) size = tc->size;
}
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
