From: Enlightenment S. <no-...@en...> - 2010-11-09 21:15:41
|
Log: Fix dnd working with reference coords Author: englebass Date: 2010-11-09 13:15:35 -0800 (Tue, 09 Nov 2010) New Revision: 54384 Modified: trunk/E-MODULES-EXTRA/iiirk/src/e_mod_main.c Modified: trunk/E-MODULES-EXTRA/iiirk/src/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/iiirk/src/e_mod_main.c 2010-11-09 21:14:38 UTC (rev 54383) +++ trunk/E-MODULES-EXTRA/iiirk/src/e_mod_main.c 2010-11-09 21:15:35 UTC (rev 54384) @@ -948,8 +948,6 @@ static void _iiirk_drop_position_update(Instance *inst, Evas_Coord x, Evas_Coord y) { - Evas_Coord xx, yy; - int ox, oy; IIirk_Icon *ic; inst->iiirk->dnd_x = x; @@ -957,9 +955,7 @@ if (inst->iiirk->o_drop) e_box_unpack(inst->iiirk->o_drop); - evas_object_geometry_get(inst->iiirk->o_box, &xx, &yy, NULL, NULL); - e_box_align_pixel_offset_get(inst->gcc->o_box, &ox, &oy); - ic = _iiirk_icon_at_coord(inst->iiirk, x + xx + ox, y + yy + oy); + ic = _iiirk_icon_at_coord(inst->iiirk, x, y); inst->iiirk->ic_drop_before = ic; if (ic) { @@ -969,11 +965,11 @@ evas_object_geometry_get(ic->o_holder, &ix, &iy, &iw, &ih); if (e_box_orientation_get(inst->iiirk->o_box)) { - if ((x + xx) < (ix + (iw / 2))) before = 1; + if (x < (ix + (iw / 2))) before = 1; } else { - if ((y + yy) < (iy + (ih / 2))) before = 1; + if (y < (iy + (ih / 2))) before = 1; } if (before) e_box_pack_before(inst->iiirk->o_box, inst->iiirk->o_drop, ic->o_holder); |