Enlightenment CVS committal

Author  : sebastid
Project : e17
Module  : apps/e

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


Modified Files:
        e_mod_main.c e_mod_main.h 


Log Message:
It's possible to add several types for one drop handler.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -3 -r1.142 -r1.143
--- e_mod_main.c        25 Sep 2005 05:30:09 -0000      1.142
+++ e_mod_main.c        5 Oct 2005 17:56:35 -0000       1.143
@@ -506,6 +506,7 @@
    Evas_Object *o;
    Evas_Coord   x, y, w, h;
    double       aspect;
+   const char  *drop[] = { "enlightenment/border", "enlightenment/pager_win" };
 
    face = E_NEW(Pager_Face, 1);
    if (!face) return NULL;
@@ -539,15 +540,9 @@
    face->drop_handler = e_drop_handler_add(face,
                                           _pager_face_cb_enter, 
_pager_face_cb_move,
                                           _pager_face_cb_leave, 
_pager_face_cb_drop,
-                                          "enlightenment/border",
+                                          drop, 2,
                                           face->fx, face->fy, face->fw, 
face->fh);
    
-   face->drop_handler_win = e_drop_handler_add(face,
-                                              _pager_face_cb_enter, 
_pager_face_cb_move,
-                                              _pager_face_cb_leave, 
_pager_face_cb_drop,
-                                              "enlightenment/pager_win",
-                                              face->fx, face->fy, face->fw, 
face->fh);
-  
    face->gmc = e_gadman_client_new(zone->container->gadman);
    _pager_face_zone_set(face, zone);
    
@@ -591,7 +586,6 @@
    e_object_del(E_OBJECT(face->gmc));
 
    e_drop_handler_del(face->drop_handler);
-   e_drop_handler_del(face->drop_handler_win);
 
    _pager_face_zone_unset(face);
 
@@ -994,10 +988,6 @@
                               face->fx + face->inset.l, face->fy + 
face->inset.t,
                               face->fw - (face->inset.l + face->inset.r),
                               face->fh - (face->inset.t + face->inset.b));
-   e_drop_handler_geometry_set(face->drop_handler_win,
-                              face->fx + face->inset.l, face->fy + 
face->inset.t,
-                              face->fw - (face->inset.l + face->inset.r),
-                              face->fh - (face->inset.t + face->inset.b));
    switch (change)
      {
       case E_GADMAN_CHANGE_MOVE_RESIZE:
@@ -2204,7 +2194,7 @@
 
    desk = e_desk_at_xy_get(face->zone, x, y);
 
-   //printf("drop %s\n", type);
+   printf("drop %s\n", type);
 
    if (!strcmp(type, "enlightenment/pager_win"))
      {
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- e_mod_main.h        24 Sep 2005 13:42:05 -0000      1.36
+++ e_mod_main.h        5 Oct 2005 17:56:35 -0000       1.37
@@ -95,7 +95,6 @@
    Config_Face  *conf;
 
    E_Drop_Handler *drop_handler;
-   E_Drop_Handler *drop_handler_win;
 
    Pager_Popup *current_popup;
 




-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to