Fix placement of windows that can't fit in workspace.

1 files changed, 17 insertions, 21 deletions

diff --git a/plugins/place.c b/plugins/place.c
index bbacfb21..5840a552 100644
--- a/plugins/place.c
+++ b/plugins/place.c
@@ -1089,35 +1089,31 @@ placeConstrainToWorkarea (CompWindow *w,
 			  int        *y)
 {
     CompWindowExtents extents;
-    int               width, height;
+    int               delta;
 
     extents.left   = *x - w->input.left;
     extents.top    = *y - w->input.top;
     extents.right  = *x + w->serverWidth + w->input.right;
     extents.bottom = *y + w->serverHeight + w->input.bottom;
 
-    width  = extents.right - extents.left;
-    height = extents.bottom - extents.top;
+    delta = workArea->x + workArea->width - extents.right;
+    if (delta < 0)
+	extents.left += delta;
 
-    if (extents.left < workArea->x)
-    {
-	*x += workArea->x - extents.left;
-    }
-    else if (width <= workArea->width &&
-	     extents.right > workArea->x + workArea->width)
-    {
-	*x += workArea->x + workArea->width - extents.right;
-    }
+    delta = workArea->x - extents.left;
+    if (delta > 0)
+    	extents.left  += delta;
 
-    if (extents.top < workArea->y)
-    {
-	*y += workArea->y - extents.top;
-    }
-    else if (height <= workArea->height &&
-	     extents.bottom > workArea->y + workArea->height)
-    {
-	*y += workArea->y + workArea->height - extents.bottom;
-    }
+    delta = workArea->y + workArea->height - extents.bottom;
+    if (delta < 0)
+	extents.top += delta;
+
+    delta = workArea->y - extents.top;
+    if (delta > 0)
+    	extents.top += delta;
+
+    *x = extents.left + w->input.left;
+    *y = extents.top  + w->input.top;
 }
 
 static Bool