diff options
| author | varkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-15 20:47:58 +0000 |
|---|---|---|
| committer | varkha@chromium.org <varkha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-15 20:47:58 +0000 |
| commit | c63e251a3d640dd89769da213c9df888bb4c0bf3 (patch) | |
| tree | 3d1a24fa2cc6b06cbf42d15737eca5bf25999162 /ash/wm | |
| parent | 1b77701b869cbe41ff88fb6be019506d2a2c8a29 (diff) | |
| download | chromium_src-c63e251a3d640dd89769da213c9df888bb4c0bf3.zip chromium_src-c63e251a3d640dd89769da213c9df888bb4c0bf3.tar.gz chromium_src-c63e251a3d640dd89769da213c9df888bb4c0bf3.tar.bz2 | |
Making panels stick near the edges of screen (correction)
https://codereview.chromium.org/18104007/ had an early exit condition for obscured edges removed by mistake during merge. Restoring it.
BUG=257622
Review URL: https://chromiumcodereview.appspot.com/19004002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/workspace/workspace_window_resizer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc index b9ab061..3037e7c 100644 --- a/ash/wm/workspace/workspace_window_resizer.cc +++ b/ash/wm/workspace/workspace_window_resizer.cc @@ -706,7 +706,7 @@ bool WorkspaceWindowResizer::UpdateMagnetismWindow(const gfx::Rect& bounds, const aura::Window::Windows& children = workspace_controller->GetActiveWorkspaceWindow()->children(); for (aura::Window::Windows::const_reverse_iterator i = children.rbegin(); - i != children.rend(); ++i) { + i != children.rend() && !matcher.AreEdgesObscured(); ++i) { aura::Window* other = *i; if (other == window() || !other->IsVisible() || |