Compiz Snapping Windows Plugin

Merge lp:~compiz-team/compiz-snap-plugin/compiz_snap_plugin.fix_872177 into lp:compiz-snap-plugin

  1. compiz_snap_plugin.fix_872177
  2. Merge into 0.9.5
Proposed by Sam Spilsbury
Status: Merged
Merged at revision: 61
Proposed branch: lp:~compiz-team/compiz-snap-plugin/compiz_snap_plugin.fix_872177
Merge into: lp:compiz-snap-plugin
Diff against target: 51 lines (+24/-1)
2 files modified
src/snap.cpp (+23/-0)
src/snap.h (+1/-1)
To merge this branch: bzr merge lp:~compiz-team/compiz-snap-plugin/compiz_snap_plugin.fix_872177
Reviewer Review Type Date Requested Status
Jason Smith (community) Approve
Review via email: mp+78926@code.launchpad.net

Description of the change

Fix bug 872177

To post a comment you must log in.
Revision history for this message
Jason Smith (jassmith) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/snap.cpp'
--- src/snap.cpp 2011-10-07 15:32:24 +0000
+++ src/snap.cpp 2011-10-11 09:11:26 +0000
@@ -148,12 +148,35 @@
148/*148/*
149 * Detect visible windows edges149 * Detect visible windows edges
150 */150 */
151
152bool
153SnapWindow::bottomScreenEdgesAllowed ()
154{
155 if (grabbed & CompWindowGrabExternalAppMask)
156 {
157 CompPlugin *pMove;
158
159 pMove = CompPlugin::find ("move");
160 if (pMove)
161 {
162 CompOption::Vector &moveOptions =
163 pMove->vTable->getOptions ();
164
165 return !(CompOption::getBoolOptionNamed (moveOptions,
166 "constrain_y", true));
167 }
168 }
169
170 return true;
171}
172
151void173void
152SnapWindow::updateWindowsEdges ()174SnapWindow::updateWindowsEdges ()
153{175{
154 CompRegion edgeRegion, resultRegion;176 CompRegion edgeRegion, resultRegion;
155 CompRect input;177 CompRect input;
156 bool remove = false;178 bool remove = false;
179 bool bottomScreenEdges = bottomScreenEdgesAllowed ();
157180
158 // First add all the windows181 // First add all the windows
159 foreach (CompWindow *w, screen->windows ())182 foreach (CompWindow *w, screen->windows ())
160183
=== modified file 'src/snap.h'
--- src/snap.h 2011-09-29 08:12:59 +0000
+++ src/snap.h 2011-10-11 09:11:26 +0000
@@ -133,7 +133,7 @@
133 // internal, avoids infinite notify loops133 // internal, avoids infinite notify loops
134 bool skipNotify;134 bool skipNotify;
135135
136136 bool bottomScreenEdgesAllowed ();
137 void move (int dx, int dy);137 void move (int dx, int dy);
138 void resize (int dx, int dy, int dwidth, int dheight);138 void resize (int dx, int dy, int dwidth, int dheight);
139139

Subscribers

People subscribed via source and target branches

to all changes: