rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=cc15ebd29dc9ad4c9b6edf00dfd65be1927422d5

commit cc15ebd29dc9ad4c9b6edf00dfd65be1927422d5
Author: Vitalii Vorobiov <vi.vorob...@samsung.com>
Date:   Wed Jan 6 14:22:26 2016 +0000

    Workspace: move group load from groupedit up to workspace
---
 src/bin/ui/workspace/groupedit.c | 3 ---
 src/bin/ui/workspace/workspace.c | 5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bin/ui/workspace/groupedit.c b/src/bin/ui/workspace/groupedit.c
index dd83078..243479c 100644
--- a/src/bin/ui/workspace/groupedit.c
+++ b/src/bin/ui/workspace/groupedit.c
@@ -79,7 +79,6 @@ _groupedit_smart_del(Evas_Object *o)
    evas_object_smart_member_del(sd->clipper);
    evas_object_hide(sd->group->edit_object);
 
-   gm_group_edit_object_unload(sd->group);
    _groupedit_parent_sc->del(o);
 }
 
@@ -207,8 +206,6 @@ groupedit_add(Evas_Object *parent, Group *group)
    WS_GROUPEDIT_DATA_GET(obj, sd);
    sd->parent = parent;
 
-   gm_group_edit_object_load(ap.project, group, evas_object_evas_get(ap.win));
-   edje_object_animation_set(group->edit_object, false);
    TODO("set the state for all parts to default 0.0")
    sd->group = group;
    evas_object_smart_member_add(sd->group->edit_object, obj);
diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c
index 14fd7c0..65eea48 100644
--- a/src/bin/ui/workspace/workspace.c
+++ b/src/bin/ui/workspace/workspace.c
@@ -1284,6 +1284,7 @@ _workspace_smart_del(Evas_Object *o)
    evas_object_del(sd->highlight.space_hl);
    evas_object_del(sd->highlight.highlight);
    demo_group_del(sd->demo_group);
+   gm_group_edit_object_unload(sd->group);
    _workspace_parent_sc->del(o);
 }
 
@@ -1493,7 +1494,6 @@ workspace_add(Evas_Object *parent, Group *group)
    Evas_Object *obj = NULL;
    Evas_Coord ruler_ver_w, ruler_hor_h, hrb_w, hrb_h;
 
-
    assert(parent != NULL);
 
    e = evas_object_evas_get(parent);
@@ -1505,6 +1505,9 @@ workspace_add(Evas_Object *parent, Group *group)
      }
    WS_DATA_GET(obj, sd);
 
+   gm_group_edit_object_load(ap.project, group, evas_object_evas_get(ap.win));
+   edje_object_animation_set(group->edit_object, false);
+
    sd->group_navigator = group_navigator_add(group);
    evas_object_size_hint_weight_set(sd->group_navigator, EVAS_HINT_EXPAND, 
EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(sd->group_navigator, EVAS_HINT_FILL, 
EVAS_HINT_FILL);

-- 


Reply via email to