Merge lp://qastaging/~3v1n0/compiz-grid-plugin/oneiric.fix_891886 into lp://qastaging/~compiz-team/compiz-grid-plugin/oneiric

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 94
Merged at revision: 96
Proposed branch: lp://qastaging/~3v1n0/compiz-grid-plugin/oneiric.fix_891886
Merge into: lp://qastaging/~compiz-team/compiz-grid-plugin/oneiric
Diff against target: 207 lines (+142/-4)
6 files modified
CMakeLists.txt (+2/-0)
src/grabhandler.cpp (+47/-0)
src/grabhandler.h (+31/-0)
src/grid.cpp (+6/-4)
tests/grabhandler/CMakeLists.txt (+9/-0)
tests/grabhandler/test-grid-grab-handler.cpp (+47/-0)
To merge this branch: bzr merge lp://qastaging/~3v1n0/compiz-grid-plugin/oneiric.fix_891886
Reviewer Review Type Date Requested Status
Sam Spilsbury Approve
Review via email: mp+82794@code.qastaging.launchpad.net

Description of the change

This branch fixes the issue causing the grid plugin to be fired on window resize introduced by the branch lp:~smspillaz/compiz-grid-plugin/oneiric.fix_750316 .

I've added an extra check to see if we're not resizing, however just using the check

   if (mask & CompWindowGrabMoveMask)

seems to do the trick as well, but I'm not totally sure that this won't interfere with the multitouch issue related to bug #750316, also if using the three-fingers move in my notebook seems to work fine.

So, if anyone can re-test both the fixes...

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Hi Marco,

Can you confirm that the testcase here would be that resizing a window to the corner *wont* show the grid overlay ?

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Yes, I confirm. The same should happen when resizing a window grabbing the top edge near to the panel.

94. By Marco Trevisan (Treviño)

Merged Sam's branch, which includes a test

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Approved, works with tests, works with multitouch

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches