Enlightenment CVS committal

Author  : metrics
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/modules/ibar


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/ibar/e_mod_main.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -3 -r1.154 -r1.155
--- e_mod_main.c        8 Oct 2006 05:38:39 -0000       1.154
+++ e_mod_main.c        12 Nov 2006 11:32:44 -0000      1.155
@@ -146,7 +146,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,
                        _ibar_inst_cb_enter, _ibar_inst_cb_move,
                        _ibar_inst_cb_leave, _ibar_inst_cb_drop,
                        drop, 3, x, y, w,  h);
@@ -1067,6 +1067,7 @@
    Evas_Object *o, *o2;
    IBar_Icon *ic;
    Evas_Coord xx, yy;
+   int x, y;
    
    ev = event_info;
    inst = data;
@@ -1084,7 +1085,8 @@
    evas_object_show(o);
    evas_object_show(o2);
    evas_object_geometry_get(inst->ibar->o_box, &xx, &yy, NULL, NULL);
-   ic = _ibar_icon_at_coord(inst->ibar, ev->x + xx, ev->y + yy);
+   e_box_align_pixel_offset_get(inst->gcc->o_box, &x, &y);
+   ic = _ibar_icon_at_coord(inst->ibar, ev->x + xx + x, ev->y + yy + y);
    inst->ibar->ic_drop_before = ic;
    if (ic)
      {
@@ -1116,6 +1118,7 @@
                          );
    _ibar_resize_handle(inst->ibar);
    _gc_orient(inst->gcc);
+   e_gadcon_client_autoscroll_update(inst->gcc, ev->x, ev->y);
 }
 
 static void
@@ -1125,12 +1128,14 @@
    Instance *inst;
    IBar_Icon *ic;
    Evas_Coord xx, yy;
+   int x, y;
    
    ev = event_info;
    inst = data;
    e_box_unpack(inst->ibar->o_drop);
    evas_object_geometry_get(inst->ibar->o_box, &xx, &yy, NULL, NULL);
-   ic = _ibar_icon_at_coord(inst->ibar, ev->x + xx, ev->y + yy);
+   e_box_align_pixel_offset_get(inst->gcc->o_box, &x, &y);
+   ic = _ibar_icon_at_coord(inst->ibar, ev->x + xx + x, ev->y + yy + y);
    inst->ibar->ic_drop_before = ic;
    if (ic)
      {
@@ -1162,6 +1167,7 @@
                          );
    _ibar_resize_handle(inst->ibar);
    _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

Reply via email to