remove E_Comp from e_resist apis

This commit is contained in:
Mike Blumenkrantz 2015-03-18 16:28:24 -04:00
parent 2454621bcd
commit 75c9d9babd
3 changed files with 7 additions and 7 deletions

View File

@ -954,7 +954,7 @@ _e_client_resize_handle(E_Client *ec)
y += (th - h); y += (th - h);
skiplist = eina_list_append(skiplist, ec); skiplist = eina_list_append(skiplist, ec);
e_resist_client_position(e_comp, skiplist, e_resist_client_position(skiplist,
ec->x, ec->y, ec->w, ec->h, ec->x, ec->y, ec->w, ec->h,
x, y, w, h, x, y, w, h,
&new_x, &new_y, &new_w, &new_h); &new_x, &new_y, &new_w, &new_h);
@ -2876,7 +2876,7 @@ e_client_mouse_move(E_Client *ec, Evas_Point *output)
e_comp_object_frame_xy_adjust(ec->frame, x, y, &new_x, &new_y); e_comp_object_frame_xy_adjust(ec->frame, x, y, &new_x, &new_y);
skiplist = eina_list_append(skiplist, ec); skiplist = eina_list_append(skiplist, ec);
e_resist_client_position(e_comp, skiplist, e_resist_client_position(skiplist,
ec->x, ec->y, ec->w, ec->h, ec->x, ec->y, ec->w, ec->h,
x, y, ec->w, ec->h, x, y, ec->w, ec->h,
&new_x, &new_y, &new_w, &new_h); &new_x, &new_y, &new_w, &new_h);

View File

@ -12,7 +12,7 @@ struct _E_Resist_Rect
static void _e_resist_rects(Eina_List *rects, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry, int *rw, int *rh); static void _e_resist_rects(Eina_List *rects, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry, int *rw, int *rh);
EAPI int EAPI int
e_resist_client_position(E_Comp *c, Eina_List *skiplist, e_resist_client_position(Eina_List *skiplist,
int px, int py, int pw, int ph, int px, int py, int pw, int ph,
int x, int y, int w, int h, int x, int y, int w, int h,
int *rx, int *ry, int *rw, int *rh) int *rx, int *ry, int *rw, int *rh)
@ -49,7 +49,7 @@ e_resist_client_position(E_Comp *c, Eina_List *skiplist,
rects = eina_list_append(rects, r); \ rects = eina_list_append(rects, r); \
} }
EINA_LIST_FOREACH(c->zones, l, zone) EINA_LIST_FOREACH(e_comp->zones, l, zone)
{ {
HOLDER(zone->x, zone->y, zone->w, zone->h, e_config->desk_resist); HOLDER(zone->x, zone->y, zone->w, zone->h, e_config->desk_resist);
} }
@ -88,7 +88,7 @@ e_resist_client_position(E_Comp *c, Eina_List *skiplist,
} }
EAPI int EAPI int
e_resist_gadman_position(E_Comp *c EINA_UNUSED, Eina_List *skiplist __UNUSED__, e_resist_gadman_position(Eina_List *skiplist __UNUSED__,
int px, int py, int pw, int ph, int px, int py, int pw, int ph,
int x, int y, int w, int h, int x, int y, int w, int h,
int *rx, int *ry) int *rx, int *ry)

View File

@ -3,8 +3,8 @@
#ifndef E_RESIST_H #ifndef E_RESIST_H
#define E_RESIST_H #define E_RESIST_H
EAPI int e_resist_client_position(E_Comp *c, Eina_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry, int *rw, int *rh); EAPI int e_resist_client_position(Eina_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry, int *rw, int *rh);
EAPI int e_resist_gadman_position(E_Comp *c, Eina_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry); EAPI int e_resist_gadman_position(Eina_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry);
#endif #endif
#endif #endif