Merge lp:~klap-in/compiz-plugins-main/bug904205 into lp:compiz-plugins-main

Proposed by klap-in on 2012-06-30
Status: Merged
Approved by: Daniel van Vugt on 2012-07-03
Approved revision: 34
Merged at revision: 34
Proposed branch: lp:~klap-in/compiz-plugins-main/bug904205
Merge into: lp:compiz-plugins-main
Diff against target: 49 lines (+10/-10)
1 file modified
wall/src/wall.cpp (+10/-10)
To merge this branch: bzr merge lp:~klap-in/compiz-plugins-main/bug904205
Reviewer Review Type Date Requested Status
Daniel van Vugt 2012-06-30 Approve on 2012-07-03
Review via email: mp+112897@code.launchpad.net

Description of the change

Using the next/previous bindings the wall plugin didn't calculate correctly the next workspace when it reachs the begin or the end of a row of workspaces, so it didn't jump to the next line.

To post a comment you must log in.
Daniel van Vugt (vanvugt) wrote :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'wall/src/wall.cpp'
2--- wall/src/wall.cpp 2012-05-09 01:57:02 +0000
3+++ wall/src/wall.cpp 2012-06-30 11:28:18 +0000
4@@ -737,17 +737,17 @@
5 if ((vpX == (unsigned int) size.width () - 1) &&
6 (vpY == (unsigned int) size.height () - 1))
7 {
8- amountX = -(size.width () - 1);
9- amountY = -(size.height () - 1);
10+ amountX = size.width () - 1;
11+ amountY = size.height () - 1;
12 }
13 else if (vpX == (unsigned int) size.width () - 1)
14 {
15- amountX = -(size.width () - 1);
16- amountY = 1;
17+ amountX = size.width () - 1;
18+ amountY = -1;
19 }
20 else
21 {
22- amountX = 1;
23+ amountX = -1;
24 amountY = 0;
25 }
26
27@@ -755,17 +755,17 @@
28 case Prev:
29 if (vpX == 0 && vpY == 0)
30 {
31- amountX = size.width () - 1;
32- amountY = size.height () - 1;
33+ amountX = -(size.width () - 1);
34+ amountY = -(size.height () - 1);
35 }
36 else if (vpX == 0)
37 {
38- amountX = size.width () - 1;
39- amountY = -1;
40+ amountX = -(size.width () - 1);
41+ amountY = 1;
42 }
43 else
44 {
45- amountX = -1;
46+ amountX = 1;
47 amountY = 0;
48 }
49 break;

Subscribers

People subscribed via source and target branches

to all changes: