rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=280a1b621853ec3cd2685d90e5aa808d6c8a1019
commit 280a1b621853ec3cd2685d90e5aa808d6c8a1019 Author: Andrii Kroitor <an.kroi...@samsung.com> Date: Wed Dec 23 16:33:52 2015 +0200 workspace: fix part restack logic --- src/bin/ui/group_navigator.c | 25 +++++-------------------- src/bin/ui/group_navigator.h | 12 +++--------- src/bin/ui/tabs.c | 18 +++++++++++++++++- src/bin/ui/workspace/workspace.c | 35 ++++++++++++++++++++--------------- src/bin/ui/workspace/workspace.h | 7 +++++++ 5 files changed, 52 insertions(+), 45 deletions(-) diff --git a/src/bin/ui/group_navigator.c b/src/bin/ui/group_navigator.c index 118ade9..711bc03 100644 --- a/src/bin/ui/group_navigator.c +++ b/src/bin/ui/group_navigator.c @@ -1198,33 +1198,21 @@ _part_restack(Part_List *pl, Elm_Object_Item *glit, Eina_Bool move_up) eina_stringshare_del(msg); } -static void -_editor_part_restacked_cb(void *data, - Evas_Object *obj __UNUSED__, - void *event_info) +void +group_navigator_part_restack(Evas_Object *obj, Part_ *part, Part_ *rel_part) { - Part_List *pl = data; - const Editor_Part_Restack *editor_part_restack = event_info; - Part_ *part, *rel_part = NULL; + Part_List *pl = evas_object_data_get(obj, GROUP_NAVIGATOR_DATA); Elm_Object_Item *glit, *rel_glit; assert(pl != NULL); - assert(editor_part_restack != NULL); - - part = elm_object_item_data_get(pl->selected_part_item); - if (strcmp(editor_part_restack->part_name, part->name)) - { - part = pm_resource_unsorted_get(part->group->parts, editor_part_restack->part_name); - group_navigator_part_select(pl->layout, part); - } + assert(part != NULL); glit = _part_item_find(pl, part); assert(glit != NULL); TODO("Update item insertion after adding top-level 'parts' item to group_navigator and delete this assert"); assert(elm_genlist_item_parent_get(glit) == NULL); - if (editor_part_restack->relative_part_name) + if (rel_part) { - rel_part = pm_resource_unsorted_get(pl->group->parts, editor_part_restack->relative_part_name); rel_glit = _part_item_find(pl, rel_part); assert(rel_glit != NULL); @@ -1249,8 +1237,6 @@ _editor_part_restacked_cb(void *data, } elm_object_item_del(glit); group_navigator_part_select(pl->layout, part); - gm_part_restack(part, rel_part); - evas_object_smart_callback_call(pl->layout, SIGNAL_GROUP_NAVIGATOR_PART_RESTACKED, (void *)editor_part_restack); } static void @@ -1520,7 +1506,6 @@ group_navigator_add(Group *group) pl->name_validator = elm_validator_regexp_new(PART_NAME_REGEX, NULL); TODO("Fix multi-tab logic"); - evas_object_smart_callback_add(ap.win, SIGNAL_EDITOR_PART_RESTACKED, _editor_part_restacked_cb, pl); evas_object_smart_callback_add(ap.win, SIGNAL_EDITOR_PART_ITEM_RESTACKED, _editor_part_item_restacked_cb, pl); TODO("Add deletion callback and free resources"); diff --git a/src/bin/ui/group_navigator.h b/src/bin/ui/group_navigator.h index dc15248..b6e54e9 100644 --- a/src/bin/ui/group_navigator.h +++ b/src/bin/ui/group_navigator.h @@ -37,15 +37,6 @@ */ #define SIGNAL_GROUP_NAVIGATOR_PART_SELECTED "SIGNAL_GROUP_NAVIGATOR_PART_SELECTED" - -/** - * emited when part is restacked in part list. - * eventinfo - pointer to Editor_Part_Restack structure - * - * @ingroup Partlist - */ -#define SIGNAL_GROUP_NAVIGATOR_PART_RESTACKED "SIGNAL_GROUP_NAVIGATOR_PART_RESTACKED" - /** * emited when part_item is restacked in part list. * eventinfo - pointer to Editor_Part_Item_Restack structure @@ -106,4 +97,7 @@ group_navigator_part_state_add(Evas_Object *obj, Part_ *part, State *state); void group_navigator_part_state_del(Evas_Object *obj, Part_ *part __UNUSED__, State *state); + +void +group_navigator_part_restack(Evas_Object *obj, Part_ *part, Part_ *rel_part); #endif /* GROUP_NAVIGATOR_H */ diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c index dc3b543..3184e45 100644 --- a/src/bin/ui/tabs.c +++ b/src/bin/ui/tabs.c @@ -382,6 +382,22 @@ _editor_state_deleted_cb(void *data __UNUSED__, workspace_part_state_del(tabs.current_workspace, editor_state->part_name, editor_state->state_name); } +static void +_editor_part_restacked_cb(void *data __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info) +{ + const Editor_Part_Restack *editor_part_restack = event_info; + + assert(editor_part_restack != NULL); + assert(tabs.current_group != NULL); + assert(tabs.current_workspace != NULL); + + workspace_part_restack(tabs.current_workspace, + editor_part_restack->part_name, + editor_part_restack->relative_part_name); +} + Evas_Object * tabs_add(void) { @@ -475,7 +491,7 @@ tabs_add(void) evas_object_smart_callback_add(ap.win, SIGNAL_EDITOR_PART_DELETED, _editor_part_deleted_cb, NULL); evas_object_smart_callback_add(ap.win, SIGNAL_EDITOR_PART_ITEM_ADDED, _editor_part_item_added_cb, NULL); evas_object_smart_callback_add(ap.win, SIGNAL_EDITOR_PART_ITEM_DELETED, _editor_part_item_deleted_cb, NULL); - //evas_object_smart_callback_add(ap.win, SIGNAL_EDITOR_PART_RESTACKED, _editor_part_restacked_cb, NULL); + evas_object_smart_callback_add(ap.win, SIGNAL_EDITOR_PART_RESTACKED, _editor_part_restacked_cb, NULL); //evas_object_smart_callback_add(ap.win, SIGNAL_EDITOR_PART_ITEM_RESTACKED, _editor_part_item_restacked_cb, NULL); evas_object_smart_callback_add(ap.win, SIGNAL_EDITOR_STATE_ADDED, _editor_state_added_cb, NULL); evas_object_smart_callback_add(ap.win, SIGNAL_EDITOR_STATE_DELETED, _editor_state_deleted_cb, NULL); diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c index d6856ee..0ba5f70 100644 --- a/src/bin/ui/workspace/workspace.c +++ b/src/bin/ui/workspace/workspace.c @@ -1468,19 +1468,6 @@ _on_group_navigator_part_select(void *data, } static void -_on_group_navigator_part_restacked(void *data, - Evas_Object *obj __UNUSED__, - void *event_info) -{ - Evas_Object *workspace = (Evas_Object *)data; - Editor_Part_Restack *ei = event_info; - - WS_DATA_GET(workspace, sd); - - groupedit_edit_object_part_restack(sd->groupedit, ei->part_name, ei->relative_part_name); -} - -static void _on_group_navigator_part_item_restacked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) @@ -1559,8 +1546,6 @@ workspace_add(Evas_Object *parent, Group *group) elm_object_part_content_set(sd->panes, "right", sd->group_navigator); evas_object_smart_callback_add(sd->group_navigator, SIGNAL_GROUP_NAVIGATOR_PART_SELECTED, _on_group_navigator_part_select, obj); - evas_object_smart_callback_add(sd->group_navigator, SIGNAL_GROUP_NAVIGATOR_PART_RESTACKED, - _on_group_navigator_part_restacked, obj); evas_object_smart_callback_add(sd->group_navigator, SIGNAL_GROUP_NAVIGATOR_PART_ITEM_RESTACKED, _on_group_navigator_part_item_restacked, obj); evas_object_smart_callback_add(sd->group_navigator, SIGNAL_GROUP_NAVIGATOR_PART_STATE_SELECTED, @@ -2003,3 +1988,23 @@ workspace_part_state_del(Evas_Object *obj, group_navigator_part_state_del(sd->group_navigator, part, state); gm_state_del(ap.project, state); } + +void +workspace_part_restack(Evas_Object *obj, + Eina_Stringshare *part_name, + Eina_Stringshare *relative_part_name) +{ + Part_ *part, *rel_part = NULL; + WS_DATA_GET(obj, sd); + assert(part_name != NULL); + + part = pm_resource_unsorted_get(sd->group->parts, part_name); + if (relative_part_name) + rel_part = pm_resource_unsorted_get(sd->group->parts, relative_part_name); + + group_navigator_part_select(sd->group_navigator, part); + group_navigator_part_restack(sd->group_navigator, part, rel_part); + gm_part_restack(part, rel_part); + + groupedit_edit_object_part_restack(sd->groupedit, part_name, relative_part_name); +} diff --git a/src/bin/ui/workspace/workspace.h b/src/bin/ui/workspace/workspace.h index c574e96..2d1dcd9 100644 --- a/src/bin/ui/workspace/workspace.h +++ b/src/bin/ui/workspace/workspace.h @@ -182,6 +182,13 @@ workspace_part_del(Evas_Object *obj, Eina_Stringshare *part_name); /** * */ +void +workspace_part_restack(Evas_Object *obj, + Eina_Stringshare *part_name, + Eina_Stringshare *relative_part_name); +/** + * + */ Eina_Bool workspace_edit_object_part_state_set(Evas_Object *obj, Part_ *part); --