summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2013-12-10 09:22:22 -0500
committerMike Blumenkrantz <zmike@samsung.com>2013-12-10 09:22:22 -0500
commit3c514097ae397bf21225cbf5cbd78606135404ac (patch)
treee1585cba73020721d813f3a20cf033813883fc2e
parenta366561336d2ed218a5304b2ee3937ae2732c440 (diff)
Revert "unify efm icon positioning code"
This reverts commit 479bb201e30549a3c0bd4d8267f591238b9c4037.
-rw-r--r--src/bin/e_fm.c31
1 files changed, 16 insertions, 15 deletions
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index f8812d54c..82fc92b31 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -4793,19 +4793,6 @@ _e_fm2_icon_label_click(void *data, Evas_Object *obj __UNUSED__, const char *emi
4793} 4793}
4794 4794
4795static void 4795static void
4796_e_fm2_icon_position(E_Fm2_Icon *ic)
4797{
4798 evas_object_move(ic->obj,
4799 ic->sd->x + ic->x - ic->sd->pos.x,
4800 ic->sd->y + ic->y - ic->sd->pos.y);
4801 evas_object_resize(ic->obj, ic->w, ic->h);
4802 evas_object_move(ic->rect,
4803 ic->sd->x + ic->x - ic->sd->pos.x,
4804 ic->sd->y + ic->y - ic->sd->pos.y);
4805 evas_object_resize(ic->rect, ic->w, ic->h);
4806}
4807
4808static void
4809_e_fm2_icon_realize(E_Fm2_Icon *ic) 4796_e_fm2_icon_realize(E_Fm2_Icon *ic)
4810{ 4797{
4811 Evas *e; 4798 Evas *e;
@@ -4872,7 +4859,14 @@ _e_fm2_icon_realize(E_Fm2_Icon *ic)
4872 _e_fm2_icon_label_set(ic, ic->obj); 4859 _e_fm2_icon_label_set(ic, ic->obj);
4873 evas_object_clip_set(ic->obj, ic->sd->clip); 4860 evas_object_clip_set(ic->obj, ic->sd->clip);
4874 evas_object_clip_set(ic->rect, ic->sd->clip); 4861 evas_object_clip_set(ic->rect, ic->sd->clip);
4875 _e_fm2_icon_position(ic); 4862 evas_object_move(ic->obj,
4863 ic->sd->x + ic->x - ic->sd->pos.x,
4864 ic->sd->y + ic->y - ic->sd->pos.y);
4865 evas_object_move(ic->rect,
4866 ic->sd->x + ic->x - ic->sd->pos.x,
4867 ic->sd->y + ic->y - ic->sd->pos.y);
4868 evas_object_resize(ic->obj, ic->w, ic->h);
4869 evas_object_resize(ic->rect, ic->w, ic->h);
4876 4870
4877 evas_object_event_callback_add(ic->rect, EVAS_CALLBACK_MOUSE_DOWN, _e_fm2_cb_icon_mouse_down, ic); 4871 evas_object_event_callback_add(ic->rect, EVAS_CALLBACK_MOUSE_DOWN, _e_fm2_cb_icon_mouse_down, ic);
4878 evas_object_event_callback_add(ic->rect, EVAS_CALLBACK_MOUSE_UP, _e_fm2_cb_icon_mouse_up, ic); 4872 evas_object_event_callback_add(ic->rect, EVAS_CALLBACK_MOUSE_UP, _e_fm2_cb_icon_mouse_up, ic);
@@ -8419,7 +8413,14 @@ _e_fm2_obj_icons_place(E_Fm2_Smart_Data *sd)
8419 { 8413 {
8420 e_thumb_icon_end(ic->obj_icon); 8414 e_thumb_icon_end(ic->obj_icon);
8421 } 8415 }
8422 _e_fm2_icon_position(ic); 8416 evas_object_move(ic->obj,
8417 sd->x + ic->x - sd->pos.x,
8418 sd->y + ic->y - sd->pos.y);
8419 evas_object_move(ic->rect,
8420 sd->x + ic->x - sd->pos.x,
8421 sd->y + ic->y - sd->pos.y);
8422 evas_object_resize(ic->obj, ic->w, ic->h);
8423 evas_object_resize(ic->rect, ic->w, ic->h);
8423 _e_fm2_icon_thumb(ic, ic->obj_icon, 0); 8424 _e_fm2_icon_thumb(ic, ic->obj_icon, 0);
8424 if (_e_fm2_view_mode_get(ic->sd) != E_FM2_VIEW_MODE_LIST) continue; 8425 if (_e_fm2_view_mode_get(ic->sd) != E_FM2_VIEW_MODE_LIST) continue;
8425 /* FIXME: this is probably something that should be unnecessary, 8426 /* FIXME: this is probably something that should be unnecessary,