diff options
Diffstat (limited to 'src/lib/edje/edje_edit.c')
| -rw-r--r-- | src/lib/edje/edje_edit.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 1aa5eb8633..4ee1f03580 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -1693,9 +1693,6 @@ _mempools_add(Edje_Part_Collection_Directory_Entry *de) EDIT_EMN(EXTERNAL, Edje_Part_Description_External, de); EDIT_EMN(SPACER, Edje_Part_Description_Common, de); EDIT_EMN(SNAPSHOT, Edje_Part_Description_Snapshot, de); - EDIT_EMN(MESH_NODE, Edje_Part_Description_Mesh_Node, de); - EDIT_EMN(LIGHT, Edje_Part_Description_Light, de); - EDIT_EMN(CAMERA, Edje_Part_Description_Camera, de); EDIT_EMN(part, Edje_Part, de); EDIT_EMNP(RECTANGLE, Edje_Part_Description_Common, de); @@ -1710,9 +1707,6 @@ _mempools_add(Edje_Part_Collection_Directory_Entry *de) EDIT_EMNP(EXTERNAL, Edje_Part_Description_External, de); EDIT_EMNP(SPACER, Edje_Part_Description_Common, de); EDIT_EMNP(SNAPSHOT, Edje_Part_Description_Snapshot, de); - EDIT_EMNP(MESH_NODE, Edje_Part_Description_Mesh_Node, de); - EDIT_EMNP(LIGHT, Edje_Part_Description_Light, de); - EDIT_EMNP(CAMERA, Edje_Part_Description_Camera, de); } EAPI Eina_Bool @@ -6298,6 +6292,7 @@ _edje_edit_state_alloc(int type, Edje *ed) Edje_Part_Description_Common *pd = NULL; ce = eina_hash_find(ed->file->collection, ed->group); + if (!ce) return NULL; switch (type) { @@ -6435,9 +6430,6 @@ edje_edit_state_add(Evas_Object *obj, const char *part, const char *name, double pd->persp.zplane = EINA_FALSE; pd->map.zoom.x = FROM_DOUBLE(1.0); pd->map.zoom.y = FROM_DOUBLE(1.0); - pd->align_3d.x = FROM_DOUBLE(0.5); - pd->align_3d.y = FROM_DOUBLE(0.5); - pd->align_3d.z = FROM_DOUBLE(0.5); pd->persp.focal = 1000; if (rp->part->type == EDJE_PART_TYPE_TEXT @@ -13370,7 +13362,7 @@ _edje_generate_source_of_style(Edje *ed, const char *name, Eina_Strbuf *buf) } static Eina_Bool -_edje_generate_source_of_program(Evas_Object *obj, const char *program, Eina_Strbuf *buf) +_edje_generate_source_of_program(Evas_Object *obj, const char *prog, Eina_Strbuf *buf) { Eina_List *l, *ll; const char *s; @@ -13379,15 +13371,13 @@ _edje_generate_source_of_program(Evas_Object *obj, const char *program, Eina_Str Eina_Bool ret = EINA_TRUE; Eina_Bool no_transition = EINA_FALSE; const char *api_name, *api_description; - Edje_Program *epr; int tweenmode = 0; GET_ED_OR_RETURN(EINA_FALSE); GET_EED_OR_RETURN(EINA_FALSE); + GET_EPR_OR_RETURN(EINA_FALSE); - epr = _edje_program_get_byname(obj, program); - - BUF_APPENDF(I3 "program { name: \"%s\";\n", program); + BUF_APPENDF(I3 "program { name: \"%s\";\n", prog); /* Signal */ s = eina_stringshare_add(epr->signal); @@ -13423,7 +13413,7 @@ _edje_generate_source_of_program(Evas_Object *obj, const char *program, Eina_Str if (epr->state) { BUF_APPENDF(I4 "action: STATE_SET \"%s\" %.2f;\n", epr->state, - edje_edit_program_value_get(obj, program)); + edje_edit_program_value_get(obj, prog)); } break; |