Compiz

Merge lp:~unity-team/compiz/x-sru4 into lp:compiz/xenial

  1. x-sru4
  2. Merge into xenial
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 4017
Merged at revision: 4017
Proposed branch: lp:~unity-team/compiz/x-sru4
Merge into: lp:compiz/xenial
Diff against target: 38 lines (+14/-0)
2 files modified
debian/changelog (+6/-0)
plugins/expo/src/expo.cpp (+8/-0)
To merge this branch: bzr merge lp:~unity-team/compiz/x-sru4
Reviewer Review Type Date Requested Status
Compiz Maintainers Pending
Review via email: mp+303701@code.launchpad.net

Commit message

Releasing SRU4 for Ubuntu 16.04

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-08-01 13:41:42 +0000
3+++ debian/changelog 2016-08-23 16:02:45 +0000
4@@ -1,3 +1,9 @@
5+compiz (1:0.9.12.2+16.04.20160801.3-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * [expo] limit scroll to workarea. (LP: #913880)
8+
9+ -- Andrea Azzarone <azzaronea@gmail.com> Tue, 23 Aug 2016 18:00:36 +0200
10+
11 compiz (1:0.9.12.2+16.04.20160801.3-0ubuntu1) xenial; urgency=medium
12
13 [ Andrea Azzarone ]
14
15=== modified file 'plugins/expo/src/expo.cpp'
16--- plugins/expo/src/expo.cpp 2016-07-28 16:56:15 +0000
17+++ plugins/expo/src/expo.cpp 2016-08-23 16:02:45 +0000
18@@ -187,6 +187,10 @@
19 if (!expoMode)
20 return false;
21
22+ CompPoint pointer (pointerX, pointerY);
23+ if (!screen->workArea ().contains (pointer))
24+ return false;
25+
26 unsigned int newX = selectedVp.x () + 1;
27 unsigned int newY = selectedVp.y ();
28
29@@ -214,6 +218,10 @@
30 if (!expoMode)
31 return false;
32
33+ CompPoint pointer (pointerX, pointerY);
34+ if (!screen->workArea ().contains (pointer))
35+ return false;
36+
37 int newX = selectedVp.x () - 1;
38 int newY = selectedVp.y ();
39

Subscribers

People subscribed via source and target branches

to all changes: