rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=bd39f171dc69e94a1af7e016ed482c3e1e96aa87
commit bd39f171dc69e94a1af7e016ed482c3e1e96aa87 Author: Vyacheslav Reutskiy <[email protected]> Date: Thu Jul 16 09:07:12 2015 +0300 Workspace: move the call 'part,name,changed' to workspace Change-Id: I6d5cf6c6e442df119a098bbff9a6dabf48abde65 --- src/bin/ui/blocks/ui_property.c | 1 - src/bin/ui/connector.c | 7 ++----- src/bin/ui/workspace/ui_workspace.c | 8 +++++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/bin/ui/blocks/ui_property.c b/src/bin/ui/blocks/ui_property.c index 7c1529f..06bf711 100644 --- a/src/bin/ui/blocks/ui_property.c +++ b/src/bin/ui/blocks/ui_property.c @@ -862,7 +862,6 @@ _on_part_name_change(void *data, workspace_edit_object_part_rename(pd->workspace, pd->wm_part->name, value); pd->wm_part->name = value; pos = elm_entry_cursor_pos_get(obj); - evas_object_smart_callback_call(pd->workspace, "part,name,changed", pd->wm_part); history_diff_add(pd->wm_style->obj, PROPERTY, MODIFY, VAL_RENAME, old_value, value, pd->wm_style->full_group_name, (void*)edje_edit_part_name_set, "rename", diff --git a/src/bin/ui/connector.c b/src/bin/ui/connector.c index 0a81f7f..140127a 100644 --- a/src/bin/ui/connector.c +++ b/src/bin/ui/connector.c @@ -520,16 +520,13 @@ _add_style_dailog(void *data, static void _part_name_change(void *data, Evas_Object *obj __UNUSED__, void *event_info) { - Part *part = (Part*)event_info; + const char *part = (const char *)event_info; App_Data *ap = (App_Data *)data; assert(ap != NULL); assert(part != NULL); - ui_widget_list_part_update(ui_block_widget_list_get(ap), part->name); - live_view_widget_style_unset(ap->live_view); - live_view_widget_style_set(ap->live_view, ap->project, ap->project->current_style); - evas_object_smart_callback_call(ui_block_widget_list_get(ap), "wl,part,select", part); + ui_widget_list_part_update(ui_block_widget_list_get(ap), part); } static void diff --git a/src/bin/ui/workspace/ui_workspace.c b/src/bin/ui/workspace/ui_workspace.c index 19f956b..bd1f2f1 100644 --- a/src/bin/ui/workspace/ui_workspace.c +++ b/src/bin/ui/workspace/ui_workspace.c @@ -1325,6 +1325,7 @@ workspace_edit_object_part_rename(Evas_Object *obj, const char *old_name, const char *new_name) { + Eina_Bool ret; WS_DATA_GET(obj, sd); assert(old_name != NULL); @@ -1334,10 +1335,11 @@ workspace_edit_object_part_rename(Evas_Object *obj, if (!strcmp(old_name, new_name)) return false; - if (groupedit_edit_object_part_draw_get(sd->groupedit, new_name)) - return false; - return groupedit_edit_object_part_rename(sd->groupedit, old_name, new_name); + ret = groupedit_edit_object_part_rename(sd->groupedit, old_name, new_name); + if (ret) + evas_object_smart_callback_call(obj, "part,name,changed", (void *)old_name); + return ret; } Eina_Bool --
