[Xfce4-commits] r23616 - xfwm4/trunk/src

[Olivier Fourdan]

Author: olivier
Date: 2006-11-03 19:30:56 +0000 (Fri, 03 Nov 2006)
New Revision: 23616

Modified:
   xfwm4/trunk/src/client.c
Log:
Resize the frame before the client, otherwise OOo 1.1.x gets totally confused on resize.

Modified: xfwm4/trunk/src/client.c
===================================================================
--- xfwm4/trunk/src/client.c	2006-11-03 19:15:42 UTC (rev 23615)
+++ xfwm4/trunk/src/client.c	2006-11-03 19:30:56 UTC (rev 23616)
@@ -593,29 +593,25 @@
     unsigned long change_mask;
     XWindowChanges change_values;
 
-    if ((mask & (CWWidth | CWHeight)) || (flags & CFG_FORCE_REDRAW))
+    change_mask = (mask & (CWX | CWY | CWWidth | CWHeight));
+    if (flags & CFG_FORCE_REDRAW)
     {
-        change_mask = (mask & (CWWidth | CWHeight));
-        change_values.width = c->width;
-        change_values.height = c->height;
-        
-        if (flags & CFG_FORCE_REDRAW)
-        {
-            change_mask |= (CWX | CWY);
-            change_values.x = frameLeft (c);
-            change_values.y = frameTop (c);
-        }
-        XConfigureWindow (clientGetXDisplay (c), c->window, change_mask, &change_values);
+        change_mask |= (CWX | CWY);
     }
-    if (mask & (CWX | CWY | CWWidth | CWHeight))
+
+    if (change_mask & (CWX | CWY | CWWidth | CWHeight))
     {
-        change_mask = (mask & (CWX | CWY | CWWidth | CWHeight));
         change_values.x = frameX (c);
         change_values.y = frameY (c);
         change_values.width = frameWidth (c);
         change_values.height = frameHeight (c);
-        
         XConfigureWindow (clientGetXDisplay (c), c->frame, change_mask, &change_values);
+
+        change_values.x = frameLeft (c);
+        change_values.y = frameTop (c);
+        change_values.width = c->width;
+        change_values.height = c->height;
+        XConfigureWindow (clientGetXDisplay (c), c->window, change_mask, &change_values);
     }
 }