Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.c
Log Message:
i'm cleaning up dnd. fixed leaks. made dnd more convenient - less work to do
(it returns x,y coords relative to the drop target geom, not the screen,
start putting in all the necessary stuff in fm2 - can dnd 2 file now (drop
has no effect though)...
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -3 -r1.188 -r1.189
--- e_mod_main.c 17 Sep 2006 06:12:48 -0000 1.188
+++ e_mod_main.c 18 Sep 2006 03:49:45 -0000 1.189
@@ -632,8 +632,10 @@
e_util_zone_current_get(e_manager_current_get()),
cx + ev->output.x, cy + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
- EVAS_BUTTON_NONE, ev->timestamp, NULL);
+ e_util_evas_fake_mouse_up_later(inst->gcc->gadcon->evas,
+ ev->button);
+// evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
+// EVAS_BUTTON_NONE, ev->timestamp, NULL);
}
}
@@ -1391,9 +1393,11 @@
pw->drag.from_pager = pw->desk->pager;
pw->drag.from_pager->dragging = 1;
pw->drag.in_pager = 0;
-
evas_event_feed_mouse_up(evas_object_evas_get(pw->desk->pager->o_table),
- pw->drag.button, EVAS_BUTTON_NONE,
- ecore_x_current_time_get(), NULL);
+
e_util_evas_fake_mouse_up_later(evas_object_evas_get(pw->desk->pager->o_table),
+ pw->drag.button);
+//
evas_event_feed_mouse_up(evas_object_evas_get(pw->desk->pager->o_table),
+// pw->drag.button, EVAS_BUTTON_NONE,
+// ecore_x_current_time_get(), NULL);
}
}
}
@@ -1470,12 +1474,12 @@
Instance *inst;
Pager_Desk *pd, *pd2;
Evas_List *l;
- int cx, cy, cw, ch;
+ Evas_Coord xx, yy;
ev = event_info;
inst = data;
- e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy, &cw, &ch);
- pd = _pager_desk_at_coord(inst->pager, ev->x - cx, ev->y - cy);
+ evas_object_geometry_get(inst->pager->o_table, &xx, &yy, NULL, NULL);
+ pd = _pager_desk_at_coord(inst->pager, ev->x + xx, ev->y + yy);
/* FIXME: keep track which one its over so we only emit drag in/out
* when it actually goes form one desk to another */
for (l = inst->pager->desks; l; l = l->next)
@@ -1517,13 +1521,14 @@
E_Border *bd = NULL;
Evas_List *l;
int dx = 0, dy = 0;
- int cx, cy, cw, ch;
Pager_Win *pw = NULL;
+ Evas_Coord xx, yy;
ev = event_info;
inst = data;
- e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy, &cw, &ch);
- pd = _pager_desk_at_coord(inst->pager, ev->x - cx, ev->y - cy);
+
+ evas_object_geometry_get(inst->pager->o_table, &xx, &yy, NULL, NULL);
+ pd = _pager_desk_at_coord(inst->pager, ev->x + xx, ev->y + yy);
if (pd)
{
if (!strcmp(type, "enlightenment/pager_win"))
@@ -1558,7 +1563,8 @@
if ((!pw) || ((pw) && (!pw->drag.no_place)))
{
e_layout_coord_canvas_to_virtual(pd->o_layout,
- ev->x - cx + dx, ev->y - cy
+ dy,
+ ev->x + xx + dx,
+ ev->y + yy + dy,
&nx, &ny);
e_border_move(bd, nx + pd->desk->zone->x, ny +
pd->desk->zone->y);
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
