From: Shinwoo Kim Date: Wed, 15 Jun 2011 04:57:56 +0000 (+0900) Subject: [ctxpopup] remove finger size, merge with open source X-Git-Tag: REL_F_I920020110621~9^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2dcab8c64418b3aabeded19d231643c5c94ff6be;p=framework%2Fuifw%2Felementary.git [ctxpopup] remove finger size, merge with open source Change-Id: Ic8a95ee2918fc360143a63f83ee25242f4487a66 --- diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c index 6ca447c..6a1ecf6 100644 --- a/src/lib/elc_ctxpopup.c +++ b/src/lib/elc_ctxpopup.c @@ -314,7 +314,6 @@ _calc_base_geometry(Evas_Object *obj, Evas_Coord_Rectangle *rect) Evas_Coord_Rectangle parent_size; Evas_Coord_Point arrow_size; Elm_Ctxpopup_Direction arrow = ELM_CTXPOPUP_DIRECTION_DOWN; - Evas_Coord finger_size; Evas_Coord_Point temp; int idx; @@ -323,8 +322,6 @@ _calc_base_geometry(Evas_Object *obj, Evas_Coord_Rectangle *rect) if ((!wd) || (!rect)) return ELM_CTXPOPUP_DIRECTION_DOWN; - finger_size = elm_finger_size_get(); - edje_object_part_geometry_get(wd->arrow, "ctxpopup_arrow", NULL, NULL, &arrow_size.x, &arrow_size.y); evas_object_resize(wd->arrow, arrow_size.x, arrow_size.y); @@ -374,37 +371,35 @@ _calc_base_geometry(Evas_Object *obj, Evas_Coord_Rectangle *rect) switch (wd->dir_priority[idx]) { case ELM_CTXPOPUP_DIRECTION_UP: - temp.y = pos.y - base_size.y; - if ((temp.y - arrow_size.y - finger_size) < hover_area.y) + temp.y = (pos.y - base_size.y); + if ((temp.y - arrow_size.y) < hover_area.y) continue; _adjust_pos_x(&pos, &base_size, &hover_area); - pos.y -= (base_size.y + finger_size); + pos.y -= base_size.y; arrow = ELM_CTXPOPUP_DIRECTION_DOWN; break; case ELM_CTXPOPUP_DIRECTION_LEFT: temp.x = (pos.x - base_size.x); - if ((temp.x - arrow_size.x - finger_size) < hover_area.x) + if ((temp.x - arrow_size.x) < hover_area.x) continue; _adjust_pos_y(&pos, &base_size, &hover_area); - pos.x -= (base_size.x + finger_size); + pos.x -= base_size.x; arrow = ELM_CTXPOPUP_DIRECTION_RIGHT; break; case ELM_CTXPOPUP_DIRECTION_RIGHT: temp.x = (pos.x + base_size.x); - if ((temp.x + arrow_size.x + finger_size) > + if ((temp.x + arrow_size.x) > (hover_area.x + hover_area.w)) continue; _adjust_pos_y(&pos, &base_size, &hover_area); - pos.x += finger_size; arrow = ELM_CTXPOPUP_DIRECTION_LEFT; break; case ELM_CTXPOPUP_DIRECTION_DOWN: temp.y = (pos.y + base_size.y); - if ((temp.y + arrow_size.y + finger_size) > + if ((temp.y + arrow_size.y) > (hover_area.y + hover_area.h)) continue; _adjust_pos_x(&pos, &base_size, &hover_area); - pos.y += finger_size; arrow = ELM_CTXPOPUP_DIRECTION_UP; break; default: @@ -432,7 +427,7 @@ _calc_base_geometry(Evas_Object *obj, Evas_Coord_Rectangle *rect) { case ELM_CTXPOPUP_DIRECTION_UP: _adjust_pos_x(&pos, &base_size, &hover_area); - pos.y -= (base_size.y + finger_size); + pos.y -= base_size.y; arrow = ELM_CTXPOPUP_DIRECTION_DOWN; if (pos.y < hover_area.y + arrow_size.y) { @@ -442,7 +437,7 @@ _calc_base_geometry(Evas_Object *obj, Evas_Coord_Rectangle *rect) break; case ELM_CTXPOPUP_DIRECTION_LEFT: _adjust_pos_y(&pos, &base_size, &hover_area); - pos.x -= (base_size.x + finger_size); + pos.x -= base_size.x; arrow = ELM_CTXPOPUP_DIRECTION_RIGHT; if (pos.x < hover_area.x + arrow_size.x) { @@ -452,7 +447,6 @@ _calc_base_geometry(Evas_Object *obj, Evas_Coord_Rectangle *rect) break; case ELM_CTXPOPUP_DIRECTION_RIGHT: _adjust_pos_y(&pos, &base_size, &hover_area); - pos.x += finger_size; arrow = ELM_CTXPOPUP_DIRECTION_LEFT; if (pos.x + arrow_size.x + base_size.x > hover_area.x + hover_area.w) @@ -462,7 +456,6 @@ _calc_base_geometry(Evas_Object *obj, Evas_Coord_Rectangle *rect) break; case ELM_CTXPOPUP_DIRECTION_DOWN: _adjust_pos_x(&pos, &base_size, &hover_area); - pos.y += finger_size; arrow = ELM_CTXPOPUP_DIRECTION_UP; if (pos.y + arrow_size.y + base_size.y > hover_area.y + hover_area.h) @@ -508,7 +501,7 @@ _update_arrow(Evas_Object *obj, Elm_Ctxpopup_Direction dir) // if user does not use dragable part arrow_size.y = (y - (arrow_size.h * 0.5)); - arrow_size.x = (x + elm_finger_size_get()); + arrow_size.x = x; edje_object_part_swallow(wd->base, "elm.swallow.arrow_left", wd->arrow); if (base_size.h > 0) @@ -525,7 +518,7 @@ _update_arrow(Evas_Object *obj, Elm_Ctxpopup_Direction dir) // if user does not use dragable part arrow_size.y = (y - (arrow_size.h * 0.5)); - arrow_size.x = (x - elm_finger_size_get() - arrow_size.w); + arrow_size.x = (x - arrow_size.w); edje_object_part_swallow(wd->base, "elm.swallow.arrow_right", wd->arrow); if (base_size.h > 0) @@ -542,7 +535,7 @@ _update_arrow(Evas_Object *obj, Elm_Ctxpopup_Direction dir) // if user does not use dragable part arrow_size.x = (x - (arrow_size.w * 0.5)); - arrow_size.y = (y + elm_finger_size_get()); + arrow_size.y = y; edje_object_part_swallow(wd->base, "elm.swallow.arrow_up", wd->arrow); if (base_size.w > 0) @@ -559,7 +552,7 @@ _update_arrow(Evas_Object *obj, Elm_Ctxpopup_Direction dir) // if user does not use dragable part arrow_size.x = (x - (arrow_size.w * 0.5)); - arrow_size.y = (y - elm_finger_size_get() - arrow_size.h); + arrow_size.y = (y - arrow_size.h); edje_object_part_swallow(wd->base, "elm.swallow.arrow_down", wd->arrow); if (base_size.w > 0)