Compiz

Merge lp:~3v1n0/compiz/scale-multimonitor-workarea into lp:compiz/0.9.12

  1. scale-multimonitor-workarea
  2. Merge into 0.9.12
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Eleni Maria Stea
Approved revision: 3989
Merged at revision: 3990
Proposed branch: lp:~3v1n0/compiz/scale-multimonitor-workarea
Merge into: lp:compiz/0.9.12
Diff against target: 11 lines (+1/-1)
1 file modified
plugins/scale/src/scale.cpp (+1/-1)
To merge this branch: bzr merge lp:~3v1n0/compiz/scale-multimonitor-workarea
Reviewer Review Type Date Requested Status
Compiz Maintainers Pending
Review via email: mp+277561@code.launchpad.net

Commit message

Scale: use current monitor workarea to check whether the mouse is inside or not

We need to care about multimonitor, and struts.

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
=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp 2014-06-06 09:41:41 +0000
+++ plugins/scale/src/scale.cpp 2015-11-16 12:16:20 +0000
@@ -1749,7 +1749,7 @@
1749 else if (optionGetClickOnDesktop () != ScaleOptions::ClickOnDesktopNone)1749 else if (optionGetClickOnDesktop () != ScaleOptions::ClickOnDesktopNone)
1750 {1750 {
1751 CompPoint pointer (button->x_root, button->y_root);1751 CompPoint pointer (button->x_root, button->y_root);
1752 CompRect workArea (screen->workArea ());1752 CompRect workArea (screen->currentOutputDev ().workArea ());
1753 workArea.setX (workArea.x() + optionGetXOffset ());1753 workArea.setX (workArea.x() + optionGetXOffset ());
1754 workArea.setY (workArea.y() + optionGetYOffset ());1754 workArea.setY (workArea.y() + optionGetYOffset ());
17551755

Subscribers

People subscribed via source and target branches