Compiz Snapping Windows Plugin

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

Proposed by Sam Spilsbury on 2011-10-11

Status:

Merged

Merged at revision:

Proposed branch:

Merge into:

Diff against target:

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

Related bugs:

Bug #872177: When dragging a window to the top of the screen and then back down again without releasing the cursor position can become offset	Medium	Confirmed
Bug #903846: cursor is placed much above the window border after dragging a snapped window	Medium	Fix Committed

Link a bug report

Reviewer	Review Type	Date Requested	Status
Jason Smith (community)		2011-10-11	Approve on 2011-10-11
Review via email: mp+78926@code.launchpad.net

Revision history for this message

Jason Smith (jassmith) on 2011-10-11:

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

 === 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 @@
  /*
   * Detect visible windows edges
   */
++
++bool
++SnapWindow::bottomScreenEdgesAllowed ()
++{
++    if (grabbed & CompWindowGrabExternalAppMask)
++    {
++	CompPlugin *pMove;
++
++	pMove = CompPlugin::find ("move");
++	if (pMove)
++	{
++	    CompOption::Vector &moveOptions =
++		pMove->vTable->getOptions ();
++
++	    return !(CompOption::getBoolOptionNamed (moveOptions,
++						     "constrain_y", true));
++	}
++    }
++
++    return true;
++}
++
  void
  SnapWindow::updateWindowsEdges ()
+ {
      CompRegion edgeRegion, resultRegion;
      CompRect   input;
      bool       remove = false;
++    bool       bottomScreenEdges = bottomScreenEdgesAllowed ();
      // First add all the windows
      foreach (CompWindow *w, screen->windows ())
 === 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 @@
  	// internal, avoids infinite notify loops
  	bool skipNotify;
--
++	bool bottomScreenEdgesAllowed ();
  	void move (int dx, int dy);
  	void resize (int dx, int dy, int dwidth, int dheight);