forked from enlightenment/enlightenment
border positions is relative to container, not zone
SVN revision: 17065
This commit is contained in:
parent
7656f2ccd0
commit
69f5ef076d
|
@ -5339,13 +5339,13 @@ _e_border_eval(E_Border *bd)
|
||||||
if (bd->cur_mouse_action)
|
if (bd->cur_mouse_action)
|
||||||
{
|
{
|
||||||
if ((!bd->cur_mouse_action->func.end_mouse) &&
|
if ((!bd->cur_mouse_action->func.end_mouse) &&
|
||||||
(!bd->cur_mouse_action->func.end))
|
(!bd->cur_mouse_action->func.end))
|
||||||
bd->cur_mouse_action = NULL;
|
bd->cur_mouse_action = NULL;
|
||||||
if (bd->cur_mouse_action)
|
if (bd->cur_mouse_action)
|
||||||
{
|
{
|
||||||
ecore_x_pointer_xy_get(bd->zone->container->win, &x, &y);
|
ecore_x_pointer_xy_get(bd->zone->container->win, &x, &y);
|
||||||
bd->x = (x - bd->zone->x) - (bd->w >> 1);
|
bd->x = x - (bd->w >> 1);
|
||||||
bd->y = (y - bd->zone->y) - (bd->client_inset.t >> 1);
|
bd->y = y - (bd->client_inset.t >> 1);
|
||||||
bd->changed = 1;
|
bd->changed = 1;
|
||||||
bd->changes.pos = 1;
|
bd->changes.pos = 1;
|
||||||
ecore_x_icccm_move_resize_send(bd->client.win,
|
ecore_x_icccm_move_resize_send(bd->client.win,
|
||||||
|
|
|
@ -459,8 +459,8 @@ e_place_zone_cursor(E_Zone *zone, int x, int y, int w, int h, int it, int *rx, i
|
||||||
E_OBJECT_CHECK(zone);
|
E_OBJECT_CHECK(zone);
|
||||||
|
|
||||||
ecore_x_pointer_xy_get(zone->container->win, &cursor_x, &cursor_y);
|
ecore_x_pointer_xy_get(zone->container->win, &cursor_x, &cursor_y);
|
||||||
*rx = (cursor_x - zone->x) - (w >> 1);
|
*rx = cursor_x - (w >> 1);
|
||||||
*ry = (cursor_y - zone->y) - (it >> 1);
|
*ry = cursor_y - (it >> 1);
|
||||||
|
|
||||||
if (*rx < zone->x)
|
if (*rx < zone->x)
|
||||||
*rx = zone->x;
|
*rx = zone->x;
|
||||||
|
@ -488,8 +488,8 @@ e_place_zone_manual(E_Zone *zone, int w, int h, int *rx, int *ry)
|
||||||
E_OBJECT_CHECK_RETURN(zone, 0);
|
E_OBJECT_CHECK_RETURN(zone, 0);
|
||||||
|
|
||||||
ecore_x_pointer_xy_get(zone->container->win, &cursor_x, &cursor_y);
|
ecore_x_pointer_xy_get(zone->container->win, &cursor_x, &cursor_y);
|
||||||
if (rx) *rx = (cursor_x - zone->x) - (w >> 1);
|
if (rx) *rx = cursor_x - (w >> 1);
|
||||||
if (ry) *ry = (cursor_y - zone->y) - (h >> 1);
|
if (ry) *ry = cursor_y - (h >> 1);
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue