rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=2fa277b48cd4a575ff7143e8fd6319377bc3c365
commit 2fa277b48cd4a575ff7143e8fd6319377bc3c365 Author: Andrii Kroitor <an.kroi...@samsung.com> Date: Thu Nov 19 16:20:07 2015 +0200 diff: add FUNCTION_TYPE_STRING_EDJEPARTTYPE --- src/bin/editor/diff.c | 12 ++++++++++++ src/bin/editor/diff.h | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/src/bin/editor/diff.c b/src/bin/editor/diff.c index a84289d..ce2e155 100644 --- a/src/bin/editor/diff.c +++ b/src/bin/editor/diff.c @@ -49,6 +49,8 @@ typedef Eina_Bool (* function_type_string) (Evas_Object *, Change*, Eina_Bool, const char *); typedef Eina_Bool (* function_type_string_string_edjeaspectcontrol) (Evas_Object *, Change*, Eina_Bool, const char *, const char *, Edje_Aspect_Control); +typedef Eina_Bool (* function_type_string_edjeparttype) (Evas_Object *, Change*, Eina_Bool, + const char *, Edje_Part_Type); typedef Eina_Bool (* function_type_string_string_double) (Evas_Object *, Change*, Eina_Bool, const char *, const char *, double); typedef Eina_Bool (* function_type_string_string_int) (Evas_Object *, Change*, Eina_Bool, @@ -98,6 +100,9 @@ _apply(Evas_Object *obj, Function_Info *fi) case FUNCTION_TYPE_STRING_STRING_DOUBLE_UCHAR: return ((function_type_string_string_double_uchar)fi->function)(obj, NULL, false, fi->args.type_ssduc.s1, fi->args.type_ssduc.s2, fi->args.type_ssduc.d3, fi->args.type_ssduc.uc4); + case FUNCTION_TYPE_STRING_EDJEPARTTYPE: + return ((function_type_string_edjeparttype)fi->function)(obj, NULL, false, + fi->args.type_sept.s1, fi->args.type_sept.ept2); case FUNCTION_TYPE_STRING_EDJETEXTEFFECT: return ((function_type_string_edjetexteffect)fi->function)(obj, NULL, false, fi->args.type_sete.s1, fi->args.type_sete.ete2); @@ -229,6 +234,10 @@ diff_update(Diff *diff, Diff *new_diff) eina_stringshare_ref(new_diff->redo.args.type_ssduc.s1); eina_stringshare_ref(new_diff->redo.args.type_ssduc.s2); break; + case FUNCTION_TYPE_STRING_EDJEPARTTYPE: + eina_stringshare_del(diff->redo.args.type_sept.s1); + eina_stringshare_ref(new_diff->redo.args.type_sept.s1); + break; case FUNCTION_TYPE_STRING_EDJETEXTEFFECT: eina_stringshare_del(diff->redo.args.type_sete.s1); eina_stringshare_ref(new_diff->redo.args.type_sete.s1); @@ -358,6 +367,9 @@ diff_free(Diff *diff) eina_stringshare_del(diff->redo.args.type_ssduc.s1); eina_stringshare_del(diff->redo.args.type_ssduc.s2); break; + case FUNCTION_TYPE_STRING_EDJEPARTTYPE: + eina_stringshare_del(diff->redo.args.type_sept.s1); + break; case FUNCTION_TYPE_STRING_EDJETEXTEFFECT: eina_stringshare_del(diff->redo.args.type_sete.s1); break; diff --git a/src/bin/editor/diff.h b/src/bin/editor/diff.h index 57ea271..17cd1f3 100644 --- a/src/bin/editor/diff.h +++ b/src/bin/editor/diff.h @@ -31,6 +31,7 @@ typedef enum { FUNCTION_TYPE_STRING_STRING_DOUBLE_STRING_DOUBLE, FUNCTION_TYPE_STRING_STRING_DOUBLE_INT_INT_INT_INT, FUNCTION_TYPE_STRING_STRING_DOUBLE_UCHAR, + FUNCTION_TYPE_STRING_EDJEPARTTYPE, FUNCTION_TYPE_STRING_EDJETEXTEFFECT, FUNCTION_TYPE_STRING_EVASEVENTFLAGS, FUNCTION_TYPE_STRING_BOOL, @@ -105,6 +106,10 @@ struct _Function_Info { } type_ssduc; struct { Eina_Stringshare *s1; + Edje_Part_Type ept2; + } type_sept; + struct { + Eina_Stringshare *s1; Edje_Text_Effect ete2; } type_sete; struct { --