Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/edje

Dir     : e17/libs/edje/src/bin


Modified Files:
        edje_cc.c edje_cc_handlers.c 


Log Message:


allow text source and text style sources to be specified.. this lets multiple
text parts "shadow" a controlling/parent text part. this allows multiple
window titles for example even tho the app only sets 1 title part. this
allows for interesting text effects with mutliepl text parts animating
differently... or you cna use invivlbe text parts ad "proxies" for
calculating sizes of stuff... :)

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- edje_cc.c   10 Oct 2004 11:58:43 -0000      1.17
+++ edje_cc.c   13 Oct 2004 03:43:41 -0000      1.18
@@ -153,6 +153,11 @@
 
    edje_file = mem_alloc(SZ(Edje_File));
    edje_file->version = EDJE_FILE_VERSION;
+   edje_file->feature_ver = 1; /* increment this every time we add a field
+                               * or feature to the edje file format that
+                               * does not load nicely as a NULL or 0 value
+                               * and needs a special fallback initialization
+                               */
    
    source_edd();
    source_fetch();
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_handlers.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- edje_cc_handlers.c  10 Oct 2004 15:18:07 -0000      1.38
+++ edje_cc_handlers.c  13 Oct 2004 03:43:41 -0000      1.39
@@ -69,6 +69,8 @@
 static void st_collections_group_parts_part_description_text_fit(void);
 static void st_collections_group_parts_part_description_text_min(void);
 static void st_collections_group_parts_part_description_text_align(void);
+static void st_collections_group_parts_part_description_text_source(void);
+static void st_collections_group_parts_part_description_text_text_source(void);
 
 static void ob_collections_group_programs_program(void);
 static void st_collections_group_programs_program_name(void);
@@ -157,6 +159,8 @@
      {"collections.group.parts.part.description.text.fit", 
st_collections_group_parts_part_description_text_fit},
      {"collections.group.parts.part.description.text.min", 
st_collections_group_parts_part_description_text_min},
      {"collections.group.parts.part.description.text.align", 
st_collections_group_parts_part_description_text_align},
+     {"collections.group.parts.part.description.text.source", 
st_collections_group_parts_part_description_text_source},
+     {"collections.group.parts.part.description.text.text_source", 
st_collections_group_parts_part_description_text_text_source},
      {"collections.group.parts.part.description.text.font", st_fonts_font}, /* dup */
      {"collections.group.parts.part.description.text.fonts.font", st_fonts_font}, /* 
dup */
      {"collections.group.parts.part.description.images.image", st_images_image}, /* 
dup */
@@ -735,6 +739,8 @@
    ed->color3.a = 128;
    ed->text.align.x = 0.5;
    ed->text.align.y = 0.5;
+   ed->text.id_source = -1;
+   ed->text.id_text_source = -1;
 }
 
 static void
@@ -1363,6 +1369,46 @@
 }
 
 static void
+st_collections_group_parts_part_description_text_source(void)
+{
+   Edje_Part_Collection *pc;
+   Edje_Part *ep;
+   Edje_Part_Description *ed;
+
+   pc = evas_list_data(evas_list_last(edje_collections));
+   ep = evas_list_data(evas_list_last(pc->parts));
+   ed = ep->default_desc;
+   if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
+     {
+       char *name;
+       
+       name = parse_str(0);
+       data_queue_part_lookup(pc, name, &(ed->text.id_source));
+       free(name);
+     }
+}
+
+static void
+st_collections_group_parts_part_description_text_text_source(void)
+{
+   Edje_Part_Collection *pc;
+   Edje_Part *ep;
+   Edje_Part_Description *ed;
+
+   pc = evas_list_data(evas_list_last(edje_collections));
+   ep = evas_list_data(evas_list_last(pc->parts));
+   ed = ep->default_desc;
+   if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
+     {
+       char *name;
+       
+       name = parse_str(0);
+       data_queue_part_lookup(pc, name, &(ed->text.id_text_source));
+       free(name);
+     }
+}
+
+static void
 ob_collections_group_programs_program(void)
 {
    Edje_Part_Collection *pc;




-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to