resize: Fix intermittant failures to properly maximize windows

Do not save the added GtkFrameExtent values to the stored workArea
lukefromdc · Feb 26, 2018 · 3350ba4 · 3350ba4
1 parent ef4bbfd
commit 3350ba4
Showing 1 changed file with 22 additions and 9 deletions.
diff --git a/plugins/resize.c b/plugins/resize.c
@@ -326,20 +326,33 @@ static Region
 resizeGetConstraintRegion (CompWindow *w, CompScreen *s)
 {
     Region       region;
-    int          i;
+    int          i , TempX, TempY, TempWidth, TempHeight;
 
     region = XCreateRegion ();
     if (!region)
 	return NULL;
-
     for (i = 0; i < s->nOutputDev; i++){
-            s->outputDev[i].workArea.x = s->outputDev[i].workArea.x + w->clientFrame.left;
-            s->outputDev[i].workArea.width = s->outputDev[i].workArea.width
-                                             - (w->clientFrame.left + w->clientFrame.right);
-            s->outputDev[i].workArea.y = s->outputDev[i].workArea.y + w->clientFrame.top;
-            s->outputDev[i].workArea.height = s->outputDev[i].workArea.height
-                                            - (w->clientFrame.top + w->clientFrame.bottom);
-            }
+        /*Save the original values here*/
+        TempX = s->outputDev[i].workArea.x;
+        TempY = s->outputDev[i].workArea.y;
+        TempWidth = s->outputDev[i].workArea.width;
+        TempHeight = s->outputDev[i].workArea.height;
+        /*Allow for GtkFrameExtents*/
+        s->outputDev[i].workArea.x = s->outputDev[i].workArea.x - w->clientFrame.left;
+        s->outputDev[i].workArea.width = s->outputDev[i].workArea.width
+                                         + (w->clientFrame.left + w->clientFrame.right);
+        s->outputDev[i].workArea.y = s->outputDev[i].workArea.y - w->clientFrame.top;
+        s->outputDev[i].workArea.height = s->outputDev[i].workArea.height
+                                        + (w->clientFrame.top + w->clientFrame.bottom);
+
+	    XUnionRectWithRegion (&s->outputDev[i].workArea, region, region);
+
+         /*Reset original workarea values*/
+        s->outputDev[i].workArea.x = TempX;
+        s->outputDev[i].workArea.y = TempY;
+        s->outputDev[i].workArea.width = TempWidth;
+        s->outputDev[i].workArea.height = TempHeight;
+        }
     return region;
 }