vtorri
/
enventor
forked from enlightenment/enventor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

live_edit: rearrange objects stack. 

Previously each live edit components are messed up in stacking.
Restacked by putting wireframe, dummy objects
below live edit object, control points, align lines and texts.

This required a totally hackishy method but there are no other solution so far.

@fix T4026
This commit is contained in:
Hermet Park 2016-07-20 14:38:34 +09:00
parent a5ecd83696
commit 63f9dc9dee
3 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/bin/live_edit.c
View File

@ -228,6 +228,21 @@ view_obj_get(live_data *ld)
return elm_object_part_content_get(o2, "elm.swallow.content");
}
static void
view_obj_member_add(live_data *ld, Evas_Object *obj)
{
//This is a trick! we got the actual view object from the live edit.
Evas_Object *scroller = view_scroller_get(ld);
if (!scroller) return;
evas_object_smart_member_add(obj, scroller);
Evas_Object *scroller_edje = elm_layout_edje_get(scroller);
Evas_Object *clipper =
(Evas_Object *)edje_object_part_object_get(scroller_edje, "clipper");
evas_object_clip_set(obj, clipper);
}
static void
view_scroll_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
@ -1428,7 +1443,6 @@ cp_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_MOVE,
cp_mouse_move_cb, data);
evas_object_layer_set(obj, CTRL_PT_LAYER);
//Hide All Control Points
live_data *ld = data;
@ -1448,11 +1462,10 @@ ctrl_pt_init(live_data *ld)
//Create Control Points
int i;
Evas_Object *view_obj = view_obj_get(ld);
for (i = 0; i < Ctrl_Pt_Cnt; i++)
{
Evas_Object *layout = elm_layout_add(ld->layout);
evas_object_smart_member_add(layout, view_obj);
view_obj_member_add(ld, layout);
elm_layout_file_set(layout, EDJE_PATH, "ctrl_pt");
evas_object_resize(layout, ctrl_size, ctrl_size);
evas_object_show(layout);
@ -1906,12 +1919,11 @@ align_line_init(live_data *ld)
{
//Create Align Lines
int i;
Evas_Object *view_obj = view_obj_get(ld);
for (i = 0; i < Align_Line_Cnt; i++)
{
//Align line should be located between live edit item and live view
Evas_Object *layout = elm_layout_add(ld->live_view);
evas_object_smart_member_add(layout, view_obj);
view_obj_member_add(ld, layout);
elm_layout_file_set(layout, EDJE_PATH, "ctrl_pt");
evas_object_show(layout);
elm_object_signal_emit(layout, "elm,state,hide,instance", "");
@ -1930,9 +1942,8 @@ info_text_init(live_data *ld)
for (i = 0; i < Info_Text_Cnt; i++)
{
Evas_Object *text = evas_object_text_add(e);
evas_object_smart_member_add(text, view_obj);
view_obj_member_add(ld, text);
evas_object_pass_events_set(text, EINA_TRUE);
evas_object_layer_set(text, INFO_TEXT_LAYER);
evas_object_text_font_set(text, LIVE_EDIT_FONT,
( LIVE_EDIT_FONT_SIZE * scale));
evas_object_text_style_set(text, EVAS_TEXT_STYLE_OUTLINE);
@ -2006,9 +2017,7 @@ live_edit_layer_set(live_data *ld)
live_edit_cancel(EINA_FALSE);
return EINA_FALSE;
}
evas_object_smart_member_add(layout, view_obj);
//Live Edit layout should be more than spacer and dummies.
evas_object_layer_set(layout, EVAS_LAYER_MAX);
view_obj_member_add(ld, layout);
elm_layout_file_set(layout, EDJE_PATH, "live_edit_layout");
evas_object_event_callback_add(layout, EVAS_CALLBACK_MOUSE_DOWN,
layout_mouse_down_cb, ld);

21
src/lib/dummy_obj.c
View File

@ -101,6 +101,15 @@ dummy_objs_update(dummy_obj *dummy)
}
}
//Trick!. set smart members of actual live view object.
Evas_Object *scroller = view_obj_get(VIEW_DATA);
if (!scroller) goto end;
Evas_Object *o = elm_object_content_get(scroller);
if (!o) goto end;
Evas_Object *o2 =
elm_object_part_content_get(o, "elm.swallow.content");
if (!o2) goto end;
//Add new part object or Update changed part.
EINA_LIST_FOREACH(parts, l, part_name)
{
@ -146,18 +155,8 @@ dummy_objs_update(dummy_obj *dummy)
}
if (!obj)
{
//Trick!. set smart members of actual live view object.
Evas_Object *scroller = view_obj_get(VIEW_DATA);
if (!scroller) continue;
Evas_Object *o = elm_object_content_get(scroller);
if (!o) continue;
Evas_Object *o2 =
elm_object_part_content_get(o, "elm.swallow.content");
if (!o2) continue;
obj = edje_object_add(evas);
edje_object_file_set(obj, EDJE_PATH, "spacer");
evas_object_layer_set(obj, EVAS_LAYER_MAX - 1);
evas_object_smart_member_add(obj, o2);
po = malloc(sizeof(part_obj));
@ -176,7 +175,7 @@ dummy_objs_update(dummy_obj *dummy)
evas_object_move(obj, lx + x, ly + y);
}
}
end:
edje_edit_string_list_free(parts);
}

29
src/lib/wireframes_obj.c
View File

@ -62,6 +62,16 @@ wireframes_objs_update(wireframes_obj *wireframes)
}
}
//Trick!. set smart members of actual live view object.
Evas_Object *scroller = view_obj_get(VIEW_DATA);
if (!scroller) goto end;
Evas_Object *o = elm_object_content_get(scroller);
if (!o) goto end;
Evas_Object *o2 =
elm_object_part_content_get(o, "elm.swallow.content");
if (!o2) goto end;
Evas *evas = evas_object_evas_get(scroller);
//Add new part object or Update changed part.
EINA_LIST_FOREACH(parts, l, part_name)
{
@ -79,22 +89,15 @@ wireframes_objs_update(wireframes_obj *wireframes)
}
if (!pobj)
{
Evas_Object *scroller = view_obj_get(VIEW_DATA);
Evas_Object *scroller_edje = elm_layout_edje_get(scroller);
Evas_Object *clipper =
(Evas_Object *)edje_object_part_object_get(scroller_edje,
"clipper");
pobj = elm_image_add(scroller);
elm_image_file_set(pobj, EDJE_PATH, "wireframes");
evas_object_smart_member_add(pobj, scroller);
pobj = edje_object_add(scroller);
edje_object_file_set(pobj, EDJE_PATH, "wireframes");
evas_object_smart_member_add(pobj, o2);
po = malloc(sizeof(part_obj));
po->obj = pobj;
po->name = eina_stringshare_add(part_name);
wireframes->part_list = eina_list_append(wireframes->part_list, po);
wireframes->part_list =
eina_list_append(wireframes->part_list, po);
evas_object_show(pobj);
evas_object_clip_set(pobj, clipper);
evas_object_data_set(pobj, OUTLINE_EDIT_LAYOUT_KEY,
wireframes->layout);
}
@ -105,7 +108,7 @@ wireframes_objs_update(wireframes_obj *wireframes)
evas_object_resize(pobj, part_w, part_h);
evas_object_move(pobj, part_lx + part_x, part_ly + part_y);
}
end:
edje_edit_string_list_free(parts);
}