Merge lp:~hikiko/compiz/compiz.fix-811591 into lp:compiz/0.9.12

[Eleni Maria Stea]

Fix for put plugin.

Fix for put plugin.

[lp:~hikiko/compiz/compiz.fix-811591]

3979. By Eleni Maria Stea on 2015-09-25

removed comment

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3978
http://jenkins.qa.ubuntu.com/job/compiz-ci/87/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/32/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3979
http://jenkins.qa.ubuntu.com/job/compiz-ci/88/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/33/console

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

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

It works now but the two comments are now invalid
/* take the shortest horizontal path to the destination viewport */

and the other one as well:
/* we need to do this for the vertical destination viewport too */

Right?

review: Needs Fixing

[Andrea Azzarone (azzar1)]

Ops actually the problem is still there. I'm using multimunitor with 9 workspaces sending a termianl window from 1 to 8.

review: Needs Fixing

[Eleni Maria Stea (hikiko)]

I forgot to test in multimonitor :/ In progress...

[lp:~hikiko/compiz/compiz.fix-811591]

3980. By Eleni Maria Stea on 2015-10-07

removed irrelevant comments

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

No worries, I think you can keep this in hold, since put plugin is not relevant for unity.

[Eleni Maria Stea (hikiko)]

+1

Unmerged revisions

3980. By Eleni Maria Stea on 2015-10-07

removed irrelevant comments

3979. By Eleni Maria Stea on 2015-09-25

removed comment

3978. By Eleni Maria Stea on 2015-09-25

fixes bug: #811591 solution proposed by Sam Spilsbury here:
https://bugs.launchpad.net/compiz/+bug/811591

=== modified file 'plugins/put/src/put.cpp'
--- plugins/put/src/put.cpp	2013-05-11 14:06:54 +0000
+++ plugins/put/src/put.cpp	2015-10-07 06:15:10 +0000
@@ -599,19 +599,9 @@
 	    if (vpY > (int) s->vpSize ().height ())
 		vpY = s->vpSize ().height () - 1;
 
-	    /* take the shortest horizontal path to the destination viewport */
 	    hDirection = (vpX - s->vp ().x ());
-	    if (hDirection > (int) s->vpSize ().width () / 2)
-		hDirection = (hDirection - s->vpSize ().width ());
-	    else if (hDirection < - ((int) s->vpSize ().width ()) / 2)
-		hDirection = (hDirection + s->vpSize ().width ());
 
-	    /* we need to do this for the vertical destination viewport too */
 	    vDirection = (vpY - s->vp ().y ());
-	    if (vDirection > (int) s->vpSize ().height () / 2)
-		vDirection = (vDirection - s->vpSize ().height ());
-	    else if (vDirection < -((int) s->vpSize ().height ()) / 2)
-		vDirection = (vDirection + s->vpSize ().height ());
 
 	    dx = s->width () * hDirection;
 	    dy = s->height () * vDirection;