rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=ae62247b089b3375a82e6d8d5d81cb35ad1c0876
commit ae62247b089b3375a82e6d8d5d81cb35ad1c0876
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date: Fri Dec 4 16:41:08 2015 +0200
groupedit: delete not actual code
Change-Id: I38c51efde5b81c707145e6b6adac7f5c3a7e8ff9
---
src/bin/ui/workspace/groupedit.c | 120 +++------------------
src/bin/ui/workspace/groupedit.h | 25 -----
src/bin/ui/workspace/groupedit_calc.c | 173 -------------------------------
src/bin/ui/workspace/groupedit_private.h | 28 +----
src/bin/ui/workspace/workspace.c | 1 -
5 files changed, 14 insertions(+), 333 deletions(-)
diff --git a/src/bin/ui/workspace/groupedit.c b/src/bin/ui/workspace/groupedit.c
index 1638e78..b5f58aa 100644
--- a/src/bin/ui/workspace/groupedit.c
+++ b/src/bin/ui/workspace/groupedit.c
@@ -40,11 +40,6 @@ _unselect_part(void *data,
if (ev->button != 1) return;
if (!sd->selected) return;
- if (sd->separated)
- {
- if (!sd->selected) return;
- _selected_item_return_to_place(sd);
- }
evas_object_smart_callback_call(o, SIGNAL_GROUPEDIT_PART_UNSELECTED,
(void *)sd->selected->part);
sd->selected = NULL;
@@ -67,11 +62,9 @@ _groupedit_smart_add(Evas_Object *o)
_unselect_part, o);
priv->obj = o;
- priv->zoom_factor = 1.0;
priv->parts = NULL;
priv->separated = false;
priv->selected = NULL;
- priv->to_select = NULL;
evas_object_smart_member_add(priv->event, o);
}
@@ -81,13 +74,10 @@ _groupedit_smart_del(Evas_Object *o)
{
WS_GROUPEDIT_DATA_GET(o, sd)
- groupedit_bg_unset(o);
-
_parts_list_free(sd);
evas_object_smart_member_del(sd->group->edit_object);
- evas_object_smart_member_del(sd->edit_obj_clipper);
+ evas_object_smart_member_del(sd->clipper);
evas_object_hide(sd->group->edit_object);
- evas_object_del(sd->edit_obj_clipper);
_groupedit_parent_sc->del(o);
}
@@ -122,7 +112,6 @@ _groupedit_smart_move(Evas_Object *o,
Evas_Coord y)
{
Evas_Coord ox, oy;
- Evas_Object *bg;
WS_GROUPEDIT_DATA_GET(o, sd)
_groupedit_parent_sc->move(o, x, y);
@@ -130,17 +119,7 @@ _groupedit_smart_move(Evas_Object *o,
evas_object_geometry_get(o, &ox, &oy, NULL, NULL);
if ((ox == x) && (oy == y)) return;
- if (sd->separated)
- {
- bg = evas_object_image_source_get(sd->bg);
- evas_object_geometry_get(bg, &ox, &oy, NULL, NULL);
- evas_object_move(sd->bg, ox, oy);
- if (sd->selected)
- {
- evas_object_geometry_get(sd->selected->item, &ox, &oy, NULL,
NULL);
- evas_object_move(sd->clipper, ox, oy);
- }
- }
+ evas_object_smart_changed(o);
}
static void
@@ -241,11 +220,10 @@ groupedit_add(Evas_Object *parent, Group *group)
/* hide the editing object by using clipper (clipper is small, it's size is
0,0)
* with such clipper object invisible and calculate geometry. */
evas_object_show(sd->group->edit_object);
-
- sd->edit_obj_clipper = evas_object_rectangle_add(sd->e);
- evas_object_clip_set(sd->group->edit_object, sd->edit_obj_clipper);
- evas_object_smart_member_add(sd->edit_obj_clipper, obj);
- evas_object_show(sd->edit_obj_clipper);
+ sd->clipper = evas_object_rectangle_add(sd->e);
+ evas_object_clip_set(sd->group->edit_object, sd->clipper);
+ evas_object_smart_member_add(sd->clipper, obj);
+ evas_object_show(sd->clipper);
return obj;
}
@@ -396,9 +374,10 @@ groupedit_part_object_area_visible_get(Evas_Object *obj)
}
Eina_Bool
-groupedit_edit_object_parts_separated(Evas_Object *obj,
- Eina_Bool separated)
+groupedit_edit_object_parts_separated(Evas_Object *obj __UNUSED__,
+ Eina_Bool separated __UNUSED__)
{
+#if 0
int w, h, count;
WS_GROUPEDIT_DATA_GET(obj, sd);
@@ -433,6 +412,7 @@ groupedit_edit_object_parts_separated(Evas_Object *obj,
evas_object_smart_callback_call(obj, SIG_PART_SEPARETE_CLOSE, NULL);
_selected_item_return_to_place(sd);
}
+#endif /* */
return true;
}
@@ -453,23 +433,13 @@ groupedit_edit_object_part_select(Evas_Object *obj, const
char *part)
{
gp = _parts_list_find(sd->parts, part);
assert(gp != NULL);
+ sd->selected = gp;
}
else
gp = NULL;
if (sd->selected && sd->selected->current_item)
elm_object_signal_emit(sd->selected->current_item->layout,
"border,part_item,hilight,off", "eflete");
-
- if (!sd->separated) sd->selected = gp;
- else
- {
- if (!part) _selected_item_return_to_place(sd);
- else
- {
- if (gp) sd->to_select = gp;
- _select_item_move_to_top(sd);
- }
- }
}
TODO("remove this from public API and use callback from part list");
@@ -491,77 +461,11 @@ groupedit_part_visible_set(Evas_Object *obj, const char
*part, Eina_Bool visible
return true;
}
-static void
-_bg_changed(void *data,
- Evas *evas __UNUSED__,
- Evas_Object *o,
- void *einfo __UNUSED__)
-{
- int w, h;
- Evas_Object *bg = (Evas_Object *)data;
-
- assert(o != NULL);
- assert(bg != NULL);
-
- evas_object_geometry_get(o, NULL, NULL, &w, &h);
- evas_object_resize(bg, w, h);
-}
-
Eina_Bool
-groupedit_bg_set(Evas_Object *obj, Evas_Object *bg)
-{
- int w, h;
-
- WS_GROUPEDIT_DATA_GET(obj, sd);
-
- if (bg)
- {
- Evas_Object *old_bg = evas_object_image_source_get(sd->bg);
- evas_object_event_callback_del_full(old_bg,
- EVAS_CALLBACK_RESIZE,
- _bg_changed, sd->bg);
- evas_object_del(old_bg);
- }
-
- sd->bg = evas_object_image_filled_add(sd->e);
- sd->clipper = evas_object_rectangle_add(sd->e);
-
- evas_object_geometry_get(bg, NULL, NULL, &w, &h);
- evas_object_image_source_set(sd->bg, bg);
- evas_object_resize(sd->bg, w, h);
- evas_object_event_callback_add(bg,
- EVAS_CALLBACK_RESIZE,
- _bg_changed, sd->bg);
-
- evas_object_smart_member_add(sd->bg, obj);
- evas_object_smart_member_add(sd->clipper, obj);
-
- return true;
-}
-
-Evas_Object *
-groupedit_bg_unset(Evas_Object *obj)
-{
- Evas_Object *bg;
- WS_GROUPEDIT_DATA_GET(obj, sd);
-
- bg = evas_object_image_source_get(sd->bg);
- evas_object_event_callback_del_full(bg,
- EVAS_CALLBACK_RESIZE,
- _bg_changed, sd->bg);
- evas_object_del(sd->bg);
- sd->bg = NULL;
-
- return bg;
-}
-
-Eina_Bool
-groupedit_zoom_factor_set(Evas_Object *obj, double factor)
+groupedit_zoom_factor_set(Evas_Object *obj, double factor __UNUSED__)
{
WS_GROUPEDIT_DATA_GET(obj, sd);
- sd->zoom_factor = factor;
-
return true;
}
diff --git a/src/bin/ui/workspace/groupedit.h b/src/bin/ui/workspace/groupedit.h
index 014156b..e7844f0 100644
--- a/src/bin/ui/workspace/groupedit.h
+++ b/src/bin/ui/workspace/groupedit.h
@@ -249,31 +249,6 @@ void
groupedit_edit_object_part_select(Evas_Object *obj, const char *part);
/**
- * Set the bg image.
- *
- * @param obj The groupedit object,
- * @param bg The Evas image.
- *
- * @return EINA_FALSE on failure, EINA_TRUE on success.
- *
- * @ingroup Groupedit
- */
-Eina_Bool
-groupedit_bg_set(Evas_Object *obj, Evas_Object *bg);
-
-/**
- * Unset the bg image.
- *
- * @param obj The groupedit object.
- *
- * @return The image object.
- *
- * @ingroup Groupedit
- */
-Evas_Object *
-groupedit_bg_unset(Evas_Object *obj);
-
-/**
* Set a visibility for groupedit part.
*
* @param obj The groupedit object
diff --git a/src/bin/ui/workspace/groupedit_calc.c
b/src/bin/ui/workspace/groupedit_calc.c
index e22ecd5..e0b74ae 100644
--- a/src/bin/ui/workspace/groupedit_calc.c
+++ b/src/bin/ui/workspace/groupedit_calc.c
@@ -81,41 +81,12 @@ _edit_object_part_del(Ws_Groupedit_Smart_Data *sd, Part_
*part)
assert(sd->parts != NULL);
assert(part != NULL);
- _selected_item_return_to_place(sd);
_part_draw_del(sd, part);
evas_object_smart_changed(sd->obj);
return true;
}
-static void
-_part_parts_layouts_update(Ws_Groupedit_Smart_Data *sd,
- Groupedit_Part *ge_part,
- Groupedit_Part *ge_part_to,
- Eina_Bool mode)
-{
- assert(sd != NULL);
- assert(ge_part != NULL);
- assert(ge_part_to != NULL);
-
- if (mode)
- {
- evas_object_stack_below(sd->bg, ge_part_to->draw);
- evas_object_stack_below(sd->clipper, ge_part_to->draw);
- evas_object_stack_below(ge_part->bg, ge_part_to->draw);
- evas_object_stack_below(ge_part->draw, ge_part_to->draw);
- evas_object_stack_below(ge_part->item, ge_part_to->draw);
- }
- else
- {
- evas_object_stack_above(sd->bg, ge_part_to->draw);
- evas_object_stack_above(sd->clipper, ge_part_to->draw);
- evas_object_stack_above(ge_part->item, ge_part_to->draw);
- evas_object_stack_above(ge_part->draw, ge_part_to->draw);
- evas_object_stack_above(ge_part->bg, ge_part_to->draw);
- }
-}
-
/**
* Internal function, which provide restack parts at parts list and restack
* part primitives at canvas.
@@ -145,7 +116,6 @@ _part_restack(Ws_Groupedit_Smart_Data *sd,
ge_part = _parts_list_find(sd->parts, part);
if (!ge_part) return false;
- if (sd->separated) sd->to_select = ge_part;
/* Here find part_to in parts stack. ge_part will be restack abow or below
* ge_part_to object. */
if (part_to)
@@ -173,13 +143,6 @@ _part_restack(Ws_Groupedit_Smart_Data *sd,
else
sd->parts = eina_list_append_relative(sd->parts, ge_part, ge_part_to);
- if (sd->separated)
- {
- _select_item_move_to_top(sd);
- return true;
- }
- _part_parts_layouts_update(sd, ge_part, ge_part_to, mode);
-
return true;
}
@@ -275,14 +238,6 @@ _groupedit_part_free(Groupedit_Part *gp)
assert(gp != NULL);
evas_object_del(gp->draw);
- if (gp->item)
- {
- evas_object_smart_member_del(gp->item);
- evas_object_del(gp->item);
- }
- if (gp->bg)
- evas_object_del(gp->bg);
-
EINA_LIST_FREE(gp->items, ge_item)
_item_draw_del(ge_item);
free(gp);
@@ -324,130 +279,6 @@ _part_item_search(Eina_List *items, const char *item_name)
return NULL;
}
-
-void
-_selected_item_return_to_place(Ws_Groupedit_Smart_Data *sd)
-{
- Groupedit_Part *gp;
- Eina_List *l, *ln;
- Eina_Bool is_below = false;
-
- assert(sd != NULL);
-
- if (!sd->selected) return;
- l = eina_list_data_find_list(sd->parts, sd->selected);
-
- ln = eina_list_prev(l);
- if (!ln)
- {
- ln = eina_list_next(l);
- if (!ln) return;
- is_below = true;
- }
-
- gp = (Groupedit_Part *)eina_list_data_get(ln);
- _part_parts_layouts_update(sd, sd->selected, gp, is_below);
- DBG("Separete mode, return to place part %s. Restack %s the part %s",
- (is_below) ? "belove" : "above", sd->selected->part->name,
gp->part->name);
-
- evas_object_hide(sd->clipper);
- evas_object_clip_unset(sd->bg);
- evas_object_hide(sd->bg);
- edje_object_signal_emit(sd->selected->item, "item,unselected", "eflete");
-}
-
-void
-_select_item_move_to_top(Ws_Groupedit_Smart_Data *sd)
-{
- assert(sd != NULL);
-
- int x, y, w, h;
- if (sd->selected == sd->to_select) return;
- if (sd->selected) _selected_item_return_to_place(sd);
-
- evas_object_geometry_get(sd->to_select->item, &x, &y, &w, &h);
- evas_object_resize(sd->clipper, w, h);
- evas_object_move(sd->clipper, x, y);
-
- DBG("clipper geometry is %i %i %i %i", x, y, w, h);
-
- evas_object_show(sd->bg);
- evas_object_show(sd->clipper);
- evas_object_clip_set(sd->bg, sd->clipper);
-
- evas_object_raise(sd->bg);
- evas_object_raise(sd->clipper);
- evas_object_raise(sd->to_select->bg);
- evas_object_raise(sd->to_select->draw);
- evas_object_raise(sd->to_select->item);
- sd->selected = sd->to_select;
- edje_object_signal_emit(sd->selected->item, "item,selected", "eflete");
- evas_object_geometry_get(sd->bg, &x, &y, &w, &h);
- DBG("bg geometry is %i %i %i %i", x, y, w, h);
-
- sd->to_select = NULL;
-}
-
-#if 0
-static void
-_part_separete_mod_mouse_click_cb(void *data,
- Evas *e __UNUSED__,
- Evas_Object *obj __UNUSED__,
- void *event_info)
-{
- Groupedit_Part *gp = (Groupedit_Part *)data;
-
- assert(gp != NULL);
-
- Ws_Groupedit_Smart_Data *sd = evas_object_data_get(gp->draw, "sd");
-
- assert(sd != NULL);
-
- Evas_Event_Mouse_Down *emd = (Evas_Event_Mouse_Down *)event_info;
-
- if (emd->button != 1) return;
- sd->to_select = gp;
- evas_object_smart_callback_call(sd->obj, SIGNAL_GROUPEDIT_PART_SELECTED,
- (void *)gp->part);
-}
-
-static void
-_part_separete_mod_mouse_in_cb(void *data,
- Evas *e __UNUSED__,
- Evas_Object *obj __UNUSED__,
- void *event_info __UNUSED__)
-{
- Groupedit_Part *gp = (Groupedit_Part *)data;
-
- assert(gp != NULL);
-
- Ws_Groupedit_Smart_Data *sd = evas_object_data_get(gp->draw, "sd");
-
- assert(sd != NULL);
-
- if (sd->selected == gp) return;
- edje_object_signal_emit(gp->item, "item,mouse,in", "eflete");
-}
-
-static void
-_part_separete_mod_mouse_out_cb(void *data,
- Evas *e __UNUSED__,
- Evas_Object *obj __UNUSED__,
- void *event_info __UNUSED__)
-{
- Groupedit_Part *gp = (Groupedit_Part *)data;
-
- assert(gp != NULL);
-
- Ws_Groupedit_Smart_Data *sd = evas_object_data_get(gp->draw, "sd");
-
- assert(sd != NULL);
-
- if (sd->selected == gp) return;
- edje_object_signal_emit(gp->item, "item,mouse,out", "eflete");
-}
-#endif /* */
-
static void
_part_select(void *data,
Evas *e __UNUSED__,
@@ -465,7 +296,6 @@ _part_select(void *data,
Evas_Event_Mouse_Down *emd = (Evas_Event_Mouse_Down *)event_info;
if (emd->button != 1) return;
- sd->to_select = gp;
evas_object_smart_callback_call(sd->obj, SIGNAL_GROUPEDIT_PART_SELECTED,
(void *)gp->part);
}
@@ -863,7 +693,6 @@ _part_draw_add(Ws_Groupedit_Smart_Data *sd, Part_ *part)
gp = mem_calloc(1, sizeof(Groupedit_Part));
gp->part = part;
- gp->item = NULL;
gp->draw = elm_box_add(sd->parent);
elm_box_layout_set(gp->draw, evas_object_box_layout_stack, NULL, NULL);
@@ -938,8 +767,6 @@ _part_draw_add(Ws_Groupedit_Smart_Data *sd, Part_ *part)
evas_object_event_callback_add(gp->draw, EVAS_CALLBACK_MOUSE_DOWN,
_part_select, gp);
- if (gp->bg)
- evas_object_smart_member_add(gp->bg, sd->obj);
evas_object_smart_member_add(gp->draw, sd->obj);
//evas_object_smart_member_add(gp->border, sd->obj);
diff --git a/src/bin/ui/workspace/groupedit_private.h
b/src/bin/ui/workspace/groupedit_private.h
index 494c243..e685058 100644
--- a/src/bin/ui/workspace/groupedit_private.h
+++ b/src/bin/ui/workspace/groupedit_private.h
@@ -62,26 +62,10 @@ struct _Ws_Groupedit_Smart_Data
Evas_Object *parent;
Evas_Object *box;
Groupedit_Geom geom;
- /* Minimal and maximum size of the container,
- i.e size of the edie_edit object */
- struct {
- int w; /* default: 0 */
- int h; /* default: 0 */
- } con_size_min;
- struct {
- int w; /* default: -1, size is not limited */
- int h; /* default: -1, size is not limited */
- } con_size_max;
- Evas_Object *edit_obj_clipper;
Eina_List *parts;
- Eina_Bool separated : 1;
Groupedit_Part *selected;
- Groupedit_Part *to_select;
- Evas_Object *bg; /**< The item background, it object overlaps
- enother groupedit part. */
- Evas_Object *clipper; /**< The background clipper, need to draw item bg
- in the separete mode.*/
- double zoom_factor; /**< current zoom factor. */
+ Evas_Object *clipper;
+ Eina_Bool separated : 1;
Eina_Bool manual_calc : 1;
};
@@ -91,12 +75,6 @@ struct _Ws_Groupedit_Smart_Data
assert(ptr != NULL);
/**
- * It a padding for parts layer in the separete mod.
- */
-#define SEP_ITEM_PAD_X 50
-#define SEP_ITEM_PAD_Y 30
-
-/**
* Groupedit part this struct contains all object for draw edit object part in
* groupedit object.
*
@@ -114,14 +92,12 @@ struct _Groupedit_Part
Part_ *part; /**< Pointer to part */
Groupedit_Geom geom;
Groupedit_Geom object_area_geom;
- Evas_Object *bg; /**< The background, uses for container parts
TABLE or BOX */
Evas_Object *draw; /**< The evas primitive to be draw in groupedit.
The valid evas object types: image,
rectangle,
text and textblock.*/
Evas_Object *proxy_part;
Evas_Object *layout;
Evas_Object *container; /**< Used for box/table parts */
- Evas_Object *item; /**< The object border in the separete mode */
Eina_List *items; /**< The items, for TABLE, BOX part types */
Groupedit_Item *current_item;
};
diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c
index f55ae8e..87e442b 100644
--- a/src/bin/ui/workspace/workspace.c
+++ b/src/bin/ui/workspace/workspace.c
@@ -1533,7 +1533,6 @@ workspace_add(Evas_Object *parent, Group *group)
_ws_ruler_abs_zero_move_cb, obj);
evas_object_smart_callback_add(sd->groupedit, "object,area,changed",
_ws_ruler_rel_zero_move_cb, obj);
- groupedit_bg_set(sd->groupedit, sd->background);
elm_object_content_set(sd->scroller, sd->container.obj);
/* getting size of rulers and handlers of container. Bottom and Left
paddings
--
