Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
clean up and re-enable pager win dragging
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -3 -r1.119 -r1.120
--- e_mod_main.c 10 Sep 2005 22:30:24 -0000 1.119
+++ e_mod_main.c 10 Sep 2005 23:47:19 -0000 1.120
@@ -534,12 +534,12 @@
"enlightenment/border",
face->fx, face->fy, face->fw,
face->fh);
- face->drop_handler = e_drop_handler_add(face,
+ 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);
@@ -574,6 +574,7 @@
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);
@@ -960,6 +961,10 @@
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:
@@ -1867,8 +1872,8 @@
if (!pw) return;
if (pw->drag.start)
{
-#if 0
- printf("DRAG: %d\n", pw);
+#if 1
+// printf("DRAG: %d\n", pw);
if ((pw->drag.x == -1) && (pw->drag.y == -1))
{
pw->drag.x = ev->cur.output.x;
@@ -1916,7 +1921,8 @@
e_drag_start(drag, pw->drag.x, pw->drag.y);
/* this prevents the desk from switching on drags */
- pw->desk->face->dragging = 1;
+ pw->drag.from_face = pw->desk->face;
+ pw->drag.from_face->dragging = 1;
evas_event_feed_mouse_up(pw->desk->face->evas, 1,
EVAS_BUTTON_NONE, ecore_time_get(), NULL);
}
@@ -1938,7 +1944,7 @@
if (pw && pw->desk && pw->desk->face)
{
- pw->desk->face->dragging = 0;
+ pw->drag.from_face->dragging = 0;
}
}
@@ -2033,6 +2039,7 @@
desk = e_desk_at_xy_get(face->zone, x, y);
+ //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.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- e_mod_main.h 10 Sep 2005 05:20:58 -0000 1.31
+++ e_mod_main.h 10 Sep 2005 23:47:19 -0000 1.32
@@ -95,6 +95,7 @@
Config_Face *conf;
E_Drop_Handler *drop_handler;
+ E_Drop_Handler *drop_handler_win;
Pager_Popup *current_popup;
@@ -126,6 +127,7 @@
Evas_Object *event_object;
struct {
+ Pager_Face *from_face;
unsigned char start : 1;
int x, y;
} drag;
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
