rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=ddc5df07165f59dc89980795bb0c243d1be02c68
commit ddc5df07165f59dc89980795bb0c243d1be02c68 Author: Vyacheslav Reutskiy <v.reuts...@samsung.com> Date: Thu Jul 16 11:04:47 2015 +0300 Groupedit: discard set text to part two times Disable the set text to edje edit object on load, because this text whatever setted on part attribute update. @fix Change-Id: I235bb5c755683c6a05fbf75bdbe2262621bd150a --- src/bin/ui/workspace/groupedit.c | 1 - src/bin/ui/workspace/groupedit_calc.c | 27 --------------------------- src/bin/ui/workspace/groupedit_private.h | 3 --- 3 files changed, 31 deletions(-) diff --git a/src/bin/ui/workspace/groupedit.c b/src/bin/ui/workspace/groupedit.c index 1c49e09..ca69e44 100644 --- a/src/bin/ui/workspace/groupedit.c +++ b/src/bin/ui/workspace/groupedit.c @@ -312,7 +312,6 @@ groupedit_edit_object_set(Evas_Object *obj, evas_object_smart_member_add(sd->edit_obj, obj); sd->edit_obj_file = file; - _edit_object_load(sd); _parts_list_free(sd); _parts_list_new(sd); diff --git a/src/bin/ui/workspace/groupedit_calc.c b/src/bin/ui/workspace/groupedit_calc.c index f3437d3..150d7cb 100644 --- a/src/bin/ui/workspace/groupedit_calc.c +++ b/src/bin/ui/workspace/groupedit_calc.c @@ -76,33 +76,6 @@ _table_param_update(Ws_Groupedit_Smart_Data *sd, Groupedit_Part *gp); static void _box_param_update(Ws_Groupedit_Smart_Data *sd, Groupedit_Part *gp); -void -_edit_object_load(Ws_Groupedit_Smart_Data *sd) -{ - Eina_List *parts_list, *l; - Edje_Part_Type ept; - const char *state, *name, *text; - double value; - - assert(sd != NULL); - - parts_list = edje_edit_parts_list_get(sd->edit_obj); - EINA_LIST_FOREACH(parts_list, l, name) - { - ept = edje_edit_part_type_get(sd->edit_obj, name); - state = edje_edit_part_selected_state_get(sd->edit_obj, name, &value); - if (ept == EDJE_PART_TYPE_TEXT || ept == EDJE_PART_TYPE_TEXTBLOCK) - { - text = edje_edit_state_text_get(sd->edit_obj, name, state, value); - if (text) edje_object_part_text_set(sd->edit_obj, name, text); - else edje_object_part_text_set(sd->edit_obj, name, name); - edje_edit_string_free(text); - } - edje_edit_string_free(state); - } - edje_edit_string_list_free(parts_list); -} - Eina_Bool _edit_object_part_add(Ws_Groupedit_Smart_Data *sd, const char *part, Edje_Part_Type type, const char *data) diff --git a/src/bin/ui/workspace/groupedit_private.h b/src/bin/ui/workspace/groupedit_private.h index 408af6c..559cedf 100644 --- a/src/bin/ui/workspace/groupedit_private.h +++ b/src/bin/ui/workspace/groupedit_private.h @@ -175,9 +175,6 @@ _parts_list_find(Eina_List *parts, const char *part); Eina_Bool _parts_recalc(Ws_Groupedit_Smart_Data *sd); -void -_edit_object_load(Ws_Groupedit_Smart_Data *sd); - Eina_Bool _edit_object_part_add(Ws_Groupedit_Smart_Data *sd, const char *part, Edje_Part_Type type, const char *data); --