From 1ac1d0755520a30aa69cec9650dd9174f76f66e5 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Wed, 18 Feb 2009 22:17:27 +0000
Subject: [PATCH] * src/placement.c: Same, still not right (Bug #4960).
(Old svn revision: 29512)
---
ChangeLog | 4 ++++
src/placement.c | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c3c5ae466..5e4146ff1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-18 olivier
+
+ * src/placement.c: Same, still not right (Bug #4960).
+
2009-02-18 olivier
* src/placement.c: Fix size not properly computed by the fill
diff --git a/src/placement.c b/src/placement.c
index b07f87a64..fde6dd3ce 100644
--- a/src/placement.c
+++ b/src/placement.c
@@ -923,10 +923,10 @@ clientFill (Client * c, int fill_type)
wc.x += MAX (frameX(west_neighbour) + frameWidth(west_neighbour) - full_x, 0);
}
- wc.width = full_w - frameRight(c) - (wc.x - rect.x);
+ wc.width = full_w - frameRight(c) - (wc.x - full_x);
if (east_neighbour)
{
- wc.width -= MAX (full_w - (frameX(east_neighbour) - rect.x), 0);
+ wc.width -= MAX (full_w - (frameX(east_neighbour) - full_x), 0);
}
wc.y = full_y + frameTop(c);
@@ -935,10 +935,10 @@ clientFill (Client * c, int fill_type)
wc.y += MAX (frameY(north_neighbour) + frameHeight(north_neighbour) - full_y, 0);
}
- wc.height = full_h - frameBottom(c) - (wc.y - rect.y);
+ wc.height = full_h - frameBottom(c) - (wc.y - full_y);
if (south_neighbour)
{
- wc.height -= MAX (full_h - (frameY(south_neighbour) - rect.y), 0);
+ wc.height -= MAX (full_h - (frameY(south_neighbour) - full_y), 0);
}
TRACE ("Fill size request: (%d,%d) %dx%d", wc.x, wc.y, wc.width, wc.height);
--
GitLab