Drag is relative to container, not zone

SVN revision: 14528
This commit is contained in:
sebastid 2005-05-01 15:30:51 +00:00 committed by sebastid
parent f604e9f494
commit 37480244b1
3 changed files with 7 additions and 10 deletions

View File

@ -207,7 +207,6 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map)
{
E_Border *bd;
Ecore_X_Window_Attributes *att;
Evas_List *list;
unsigned int managed, desk[2];
int deskx, desky;
@ -1315,8 +1314,6 @@ e_border_act_kill_begin(E_Border *bd)
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 @@ _e_border_cb_mouse_move(void *data, int type, void *event)
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);

View File

@ -102,14 +102,14 @@ e_dnd_active(void)
}
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 @@ e_drag_start(E_Zone *zone, const char *type, void *data,
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);

View File

@ -30,7 +30,7 @@ EAPI int e_dnd_shutdown(void);
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);