From 69f5ef076d1d029e29866a1db49518298dffadb0 Mon Sep 17 00:00:00 2001
From: sebastid <sebastid>
Date: Thu, 29 Sep 2005 12:48:32 +0000
Subject: [PATCH] border positions is relative to container, not zone

SVN revision: 17065
---
 src/bin/e_border.c | 6 +++---
 src/bin/e_place.c  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 480ba50cf..078e219eb 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -5339,13 +5339,13 @@ _e_border_eval(E_Border *bd)
 	     if (bd->cur_mouse_action)
 	       {
 		  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;
 		  if (bd->cur_mouse_action)
 		    {
 		       ecore_x_pointer_xy_get(bd->zone->container->win, &x, &y);
-		       bd->x = (x - bd->zone->x) - (bd->w >> 1);
-		       bd->y = (y - bd->zone->y) - (bd->client_inset.t >> 1);
+		       bd->x = x - (bd->w >> 1);
+		       bd->y = y - (bd->client_inset.t >> 1);
 		       bd->changed = 1;
 		       bd->changes.pos = 1;
 		       ecore_x_icccm_move_resize_send(bd->client.win,
diff --git a/src/bin/e_place.c b/src/bin/e_place.c
index cb93365b1..7280232ca 100644
--- a/src/bin/e_place.c
+++ b/src/bin/e_place.c
@@ -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);
 
    ecore_x_pointer_xy_get(zone->container->win, &cursor_x, &cursor_y);
-   *rx = (cursor_x - zone->x) - (w >> 1);
-   *ry = (cursor_y - zone->y) - (it >> 1);
+   *rx = cursor_x - (w >> 1);
+   *ry = cursor_y - (it >> 1);
 
    if (*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);
 
    ecore_x_pointer_xy_get(zone->container->win, &cursor_x, &cursor_y);
-   if (rx) *rx = (cursor_x - zone->x) - (w >> 1);
-   if (ry) *ry = (cursor_y - zone->y) - (h >> 1);
+   if (rx) *rx = cursor_x - (w >> 1);
+   if (ry) *ry = cursor_y - (h >> 1);
 
    return 1;
 }