rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=9e89979e72ec2c53c43b6522dc2520edf00eb54a
commit 9e89979e72ec2c53c43b6522dc2520edf00eb54a Author: Andrii Kroitor <an.kroi...@samsung.com> Date: Wed Oct 7 14:45:41 2015 +0300 property: use editor api for text effects --- src/bin/editor/editor.h | 3 +++ src/bin/ui/property.c | 22 +++++++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/bin/editor/editor.h b/src/bin/editor/editor.h index 235ad83..a7d86d4 100644 --- a/src/bin/editor/editor.h +++ b/src/bin/editor/editor.h @@ -522,5 +522,8 @@ editor_part_source5_set(Evas_Object *obj, Change *change, Eina_Bool merge, const Eina_Bool editor_part_source6_set(Evas_Object *obj, Change *change, Eina_Bool merge, const char *part_name, const char * new_val); +Eina_Bool +editor_part_effect_set(Evas_Object *obj, Change *change, Eina_Bool merge, const char *part_name, + Edje_Text_Effect new_val); #endif /* EDITOR_H */ diff --git a/src/bin/ui/property.c b/src/bin/ui/property.c index f24c3c2..ca547ba 100644 --- a/src/bin/ui/property.c +++ b/src/bin/ui/property.c @@ -2376,13 +2376,15 @@ _text_effect_update(Prop_Data *pd) Edje_Text_Effect effect; assert(pd != NULL); + assert(pd->change != NULL); effect = ewe_combobox_select_item_get(pd->attributes.state_text.effect)->index | ewe_combobox_select_item_get(pd->attributes.state_text.effect_direction)->index << 4; - edje_edit_part_effect_set(pd->group->edit_object, pd->part->name, effect); + editor_part_effect_set(pd->group->edit_object, pd->change, false, pd->part->name, effect); + history_change_add(pd->group->history, pd->change); evas_object_smart_callback_call(ap.win, SIGNAL_PROPERTY_ATTRIBUTE_CHANGED, NULL); - //project_changed(false); + pd->change = NULL; } static void @@ -2433,8 +2435,16 @@ _on_text_effect_direction_changed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - assert(data != NULL); + Prop_Data *pd = (Prop_Data *)data; + Ewe_Combobox_Item *item; + + assert(pd != NULL); + assert(pd->change == NULL); + item = ewe_combobox_select_item_get(pd->attributes.state_text.effect_direction); + Eina_Stringshare *msg = eina_stringshare_printf(_("effect direction changed to %s"), item->title); + pd->change = change_add(msg); + eina_stringshare_del(msg); _text_effect_update((Prop_Data *)data); } @@ -2444,11 +2454,17 @@ _on_text_effect_changed(void *data, void *event_info __UNUSED__) { Prop_Data *pd = (Prop_Data *)data; + Ewe_Combobox_Item *item; assert(pd != NULL); + assert(pd->change == NULL); _text_effect_contols_update(pd); ewe_combobox_select_item_set(pd->attributes.state_text.effect_direction, 0); + item = ewe_combobox_select_item_get(pd->attributes.state_text.effect); + Eina_Stringshare *msg = eina_stringshare_printf(_("effect changed to %s"), item->title); + pd->change = change_add(msg); + eina_stringshare_del(msg); _text_effect_update((Prop_Data *)data); } --