Enlightenment CVS committal
Author : metrics
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibox
Modified Files:
e_mod_main.c
Log Message:
Start of fix for drag and drop to autoscrolling ibar/ibox.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/ibox/e_mod_main.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- e_mod_main.c 24 Oct 2006 18:32:58 -0000 1.71
+++ e_mod_main.c 12 Nov 2006 11:32:44 -0000 1.72
@@ -156,7 +156,7 @@
evas_object_geometry_get(o, &x, &y, &w, &h);
inst->drop_handler =
- e_drop_handler_add(E_OBJECT(inst->gcc->gadcon), inst,
+ e_drop_handler_add(E_OBJECT(inst->gcc), inst,
_ibox_inst_cb_enter, _ibox_inst_cb_move,
_ibox_inst_cb_leave, _ibox_inst_cb_drop,
drop, 1, x, y, w, h);
@@ -820,6 +820,7 @@
Evas_Object *o, *o2;
IBox_Icon *ic;
Evas_Coord xx, yy;
+ int x, y;
ev = event_info;
inst = data;
@@ -837,7 +838,8 @@
evas_object_show(o);
evas_object_show(o2);
evas_object_geometry_get(inst->ibox->o_box, &xx, &yy, NULL, NULL);
- ic = _ibox_icon_at_coord(inst->ibox, ev->x + xx, ev->y + yy);
+ e_box_align_pixel_offset_get(inst->gcc->o_box, &x, &y);
+ ic = _ibox_icon_at_coord(inst->ibox, ev->x + xx + x, ev->y + yy + y);
inst->ibox->ic_drop_before = ic;
if (ic)
{
@@ -869,6 +871,7 @@
);
_ibox_resize_handle(inst->ibox);
_gc_orient(inst->gcc);
+ e_gadcon_client_autoscroll_update(inst->gcc, ev->x, ev->y);
}
static void
@@ -878,12 +881,14 @@
Instance *inst;
IBox_Icon *ic;
Evas_Coord xx, yy;
+ int x, y;
ev = event_info;
inst = data;
e_box_unpack(inst->ibox->o_drop);
evas_object_geometry_get(inst->ibox->o_box, &xx, &yy, NULL, NULL);
- ic = _ibox_icon_at_coord(inst->ibox, ev->x, ev->y);
+ e_box_align_pixel_offset_get(inst->gcc->o_box, &x, &y);
+ ic = _ibox_icon_at_coord(inst->ibox, ev->x + xx + x, ev->y + yy + y);
inst->ibox->ic_drop_before = ic;
if (ic)
{
@@ -915,6 +920,7 @@
);
_ibox_resize_handle(inst->ibox);
_gc_orient(inst->gcc);
+ e_gadcon_client_autoscroll_update(inst->gcc, ev->x, ev->y);
}
static void
-------------------------------------------------------------------------
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
