From: Dana Jansens <danakj@orodu.net>
Date: Tue, 29 May 2007 00:04:43 +0000 (+0000)
Subject: merge r7031 from trunk
X-Git-Tag: openbox-3_3_995-RELEASE~42
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=ef885b37d1a2980cc4dfb40d67b6fcd3996845b4;p=dana%2Fopenbox.git

merge r7031 from trunk
---

diff --git a/openbox/client.c b/openbox/client.c
index a2f69d18..0701d3fa 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -429,12 +429,8 @@ void client_manage(Window window)
 
         /* fit the window inside the area */
         if (placew > a.width || self->area.height > a.height) {
-            placew = MAX(MIN(MIN(self->area.width, a.width),
-                             self->max_size.width),
-                         self->min_size.width);
-            placeh = MAX(MIN(MIN(self->area.height, a.height),
-                             self->max_size.height),
-                         self->min_size.height);
+            placew = MIN(self->area.width, a.width);
+            placeh = MIN(self->area.height, a.height);
 
             ob_debug("setting window size to %dx%d\n",
                      self->area.width, self->area.height);