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
Log Message:
Slight re-organization of color classes, now can be set per-description rather
than per-part. This will probably break old edje's.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- edje_calc.c 19 Oct 2003 02:11:06 -0000 1.18
+++ edje_calc.c 29 Oct 2003 06:42:03 -0000 1.19
@@ -697,11 +697,11 @@
else
p3 = p1;
- if ((ep->part->color_class) && (strlen(ep->part->color_class) > 0))
+ if ((chosen_desc->color_class) && (strlen(chosen_desc->color_class) > 0))
{
Ejde_Color_Class *cc;
- cc = _edje_color_class_find(ed, ep->part->color_class);
+ cc = _edje_color_class_find(ed, chosen_desc->color_class);
if (cc)
{
p3.color.r = (((int)cc->r + 1) * p3.color.r) >> 8;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_data.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- edje_data.c 1 Sep 2003 02:53:08 -0000 1.11
+++ edje_data.c 29 Oct 2003 06:42:03 -0000 1.12
@@ -141,6 +141,7 @@
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "fill.pos_abs_y", fill.pos_abs_y, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "fill.rel_y", fill.rel_y, EET_T_DOUBLE);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "fill.abs_y", fill.abs_y, EET_T_INT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "color_class", color_class, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "color.r", color.r, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "color.g", color.g, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "color.b", color.b, EET_T_UCHAR);
@@ -172,7 +173,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, "color_class",
color_class, EET_T_STRING);
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);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- edje_load.c 20 Oct 2003 06:10:09 -0000 1.29
+++ edje_load.c 29 Oct 2003 06:42:03 -0000 1.30
@@ -574,7 +574,6 @@
ep = ec->parts->data;
ec->parts = evas_list_remove(ec->parts, ep);
if (ep->name) free(ep->name);
- if (ep->color_class) free(ep->color_class);
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)
@@ -612,6 +611,7 @@
}
if (desc->text.text) free(desc->text.text);
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.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- edje_private.h 20 Oct 2003 06:10:09 -0000 1.46
+++ edje_private.h 29 Oct 2003 06:42:03 -0000 1.47
@@ -235,13 +235,12 @@
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 *color_class; /* how to modify the color */
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 {
- char x; /* can u click & drag this bit in x dir */
- char y; /* can u click & drag this bit in y dir */
+ signed char x; /* can u click & drag this bit in x dir */
+ signed char y; /* can u click & drag this bit in y dir */
int step_x; /* drag jumps n pixels (0 = no limit) */
int step_y; /* drag jumps n pixels (0 = no limit) */
@@ -313,6 +312,8 @@
double rel_y; /* relative size compared to area */
int abs_y; /* size of fill added to relative fill */
} fill;
+
+ char *color_class; /* how to modify the color */
struct {
unsigned char r, g, b, a; /* color for rect or text, shadow etc. */
-------------------------------------------------------
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
