Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_dnd.c e_dnd.h
Log Message:
Drag is relative to container, not zone
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -3 -r1.171 -r1.172
--- e_border.c 30 Apr 2005 07:03:34 -0000 1.171
+++ e_border.c 1 May 2005 15:30:51 -0000 1.172
@@ -207,7 +207,6 @@
{
E_Border *bd;
Ecore_X_Window_Attributes *att;
- Evas_List *list;
unsigned int managed, desk[2];
int deskx, desky;
@@ -1315,8 +1314,6 @@
static void
_e_border_free(E_Border *bd)
{
- Evas_List *list;
-
if (resize == bd)
_e_border_resize_end(bd);
if (move == bd)
@@ -2525,7 +2522,7 @@
bd->client.icccm.class);
if (a)
{
- e_drag_start(bd->zone, "enlightenment/border",
bd,
+ e_drag_start(bd->zone->container,
"enlightenment/border", bd,
a->path, "icon");
evas_event_feed_mouse_up(bd->bg_evas, 1,
EVAS_BUTTON_NONE,
NULL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_dnd.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_dnd.c 29 Apr 2005 15:04:45 -0000 1.10
+++ e_dnd.c 1 May 2005 15:30:51 -0000 1.11
@@ -102,14 +102,14 @@
}
void
-e_drag_start(E_Zone *zone, const char *type, void *data,
+e_drag_start(E_Container *con, const char *type, void *data,
const char *icon_path, const char *icon)
{
int w, h;
- drag_win = ecore_x_window_input_new(zone->container->win,
- zone->x, zone->y,
- zone->w, zone->h);
+ drag_win = ecore_x_window_input_new(con->win,
+ con->x, con->y,
+ con->w, con->h);
ecore_x_window_show(drag_win);
ecore_x_pointer_confine_grab(drag_win);
ecore_x_keyboard_grab(drag_win);
@@ -120,7 +120,7 @@
ecore_evas_free(drag_ee);
}
- drag_ee = ecore_evas_software_x11_new(NULL, zone->container->win,
+ drag_ee = ecore_evas_software_x11_new(NULL, con->win,
0, 0, 10, 10);
ecore_evas_override_set(drag_ee, 1);
ecore_evas_software_x11_direct_resize_set(drag_ee, 1);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_dnd.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_dnd.h 29 Apr 2005 15:04:45 -0000 1.6
+++ e_dnd.h 1 May 2005 15:30:51 -0000 1.7
@@ -30,7 +30,7 @@
EAPI int e_dnd_active(void);
-EAPI void e_drag_start(E_Zone *zone, const char *type, void *data,
+EAPI void e_drag_start(E_Container *con, const char *type, void *data,
const char *icon_path, const char *icon);
EAPI void e_drag_update(int x, int y);
EAPI void e_drag_end(int x, int y);
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.
Get your fingers limbered up and give it your best shot. 4 great events, 4
opportunities to win big! Highest score wins.NEC IT Guy Games. Play to
win an NEC 61 plasma display. Visit http://www.necitguy.com/?r=20
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
