Merge lp://qastaging/~smspillaz/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken.wall_edge_flip_logic into lp://qastaging/~mc-return/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken
Status: | Merged |
---|---|
Merged at revision: | 3680 |
Proposed branch: | lp://qastaging/~smspillaz/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken.wall_edge_flip_logic |
Merge into: | lp://qastaging/~mc-return/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken |
Diff against target: |
331 lines (+111/-61) 5 files modified
plugins/wall/src/wall.cpp (+49/-55) plugins/wall/src/wall.h (+2/-4) plugins/wall/wall.xml.in (+4/-1) src/screen.cpp (+7/-1) tests/manual/plugins/wall.txt (+49/-0) |
To merge this branch: | bzr merge lp://qastaging/~smspillaz/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken.wall_edge_flip_logic |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sam Spilsbury | Pending | ||
MC Return | Pending | ||
Review via email: mp+163887@code.qastaging.launchpad.net |
This proposal supersedes a proposal from 2013-05-13.
Commit message
wall: Remove mouse polling edge flip detection code, instead turn edges on
in the following situations:
1. Edge flip pointer is on (always on)
2. Edge flip move is on, and the screen is grabbed (someone is moving
a window)
3. Edge flip dnd is on, and a dnd type window is mapped (someone is
doing a dnd)
Fix a misconstructed boolean condition in removeAction that could cause
actions to be removed twice and as such cause the edge reference count to
go negative.
Note that dnd window detection is a bit imprecise, but I didn't want to resort
to using some exotic workarounds for the dnd edge cases (such as non-EWMH
compliant dnd windows which are still compliant with ICCCM).
Description of the change
wall: Remove mouse polling edge flip detection code, instead turn edges on
in the following situations:
1. Edge flip pointer is on (always on)
2. Edge flip move is on, and the screen is grabbed (someone is moving
a window)
3. Edge flip dnd is on, and a dnd type window is mapped (someone is
doing a dnd)
Fix a misconstructed boolean condition in removeAction that could cause
actions to be removed twice and as such cause the edge reference count to
go negative.
Note that dnd window detection is a bit imprecise, but I didn't want to resort
to using some exotic workarounds for the dnd edge cases (such as non-EWMH
compliant dnd windows which are still compliant with ICCCM)
You did it :)
From a first look:
Typos:
332 + or colum
316 + or colum
I do not understand this step:
292 + and set up screen edges as appropriate
307 + and set up screen edges as appropriate
323 + and set up screen edges as appropriate
I think this ^^ could be removed.
Please add newlines after:
66 + break;
70 + break;
The rest LGTM. I will test this ASAP.