Merge lp:~townsend/compiz/fix-lp347390 into lp:compiz/0.9.11

[Christopher Townsend]

Fix issue where horizontal and vertical keyboard resizing could not happen at the same time.

Fix issue where horizontal and vertical keyboard resizing could not happen at the same time.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3861
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/78/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/78/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Cool

review: Approve

=== modified file 'plugins/resize/src/logic/include/resize-logic.h'
--- plugins/resize/src/logic/include/resize-logic.h	2012-08-15 21:36:40 +0000
+++ plugins/resize/src/logic/include/resize-logic.h	2014-05-28 07:29:08 +0000
@@ -176,6 +176,9 @@
 			    unsigned int output,
 			    int		&op,
 			    int		&wap);
+
+	unsigned int lastMaskX;
+	unsigned int lastMaskY;
 };
 
 #endif /* RESIZELOGIC_H */
 
=== modified file 'plugins/resize/src/logic/src/resize-logic.cpp'
--- plugins/resize/src/logic/src/resize-logic.cpp	2014-03-11 18:35:18 +0000
+++ plugins/resize/src/logic/src/resize-logic.cpp	2014-05-28 07:29:08 +0000
@@ -65,7 +65,9 @@
     offWorkAreaConstrained (true),
     options (NULL),
     cScreen (NULL),
-    gScreen (NULL)
+    gScreen (NULL),
+    lastMaskX (0),
+    lastMaskY (0)
 {
     rKeys[0].name	= "Left";
     rKeys[0].dx		= -1;
@@ -411,6 +413,19 @@
 
 		mask = rKeys[i].resizeMask;
 
+		if ((mask & ResizeLeftMask || mask & ResizeRightMask) && (mask != lastMaskX))
+		{
+		    pointerDx *= -1;
+
+		    lastMaskX = mask;
+		}
+		if ((mask & ResizeUpMask || mask & ResizeDownMask) && (mask != lastMaskY))
+		{
+		    pointerDy *= -1;
+
+		    lastMaskY = mask;
+		}
+
 		mScreen->updateGrab (grabIndex, cursor[i]);
 	    }
 	    break;
@@ -439,14 +454,14 @@
 	    accumulatePointerMotion (xRoot, yRoot);
 	}
 
-	if (mask & ResizeLeftMask)
+	if (mask & ResizeLeftMask || lastMaskX & ResizeLeftMask)
 	    wi -= pointerDx;
-	else if (mask & ResizeRightMask)
+	else if (mask & ResizeRightMask || lastMaskX & ResizeRightMask)
 	    wi += pointerDx;
 
-	if (mask & ResizeUpMask)
+	if (mask & ResizeUpMask || lastMaskY & ResizeUpMask)
 	    he -= pointerDy;
-	else if (mask & ResizeDownMask)
+	else if (mask & ResizeDownMask || lastMaskY & ResizeDownMask)
 	    he += pointerDy;
 
 	if (w->state () & CompWindowStateMaximizedVertMask)