summaryrefslogtreecommitdiffstats
path: root/ash/wm/window_resizer.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-21 06:44:29 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-21 06:44:29 +0000
commitb7534558c6366d9c7557b7aef75d0f4611197481 (patch)
tree6745daf6f5725162063694e0c3df66c320862f94 /ash/wm/window_resizer.cc
parentb7061197543fb6eea40bc147f2dd7da98f4ba44c (diff)
downloadchromium_src-b7534558c6366d9c7557b7aef75d0f4611197481.zip
chromium_src-b7534558c6366d9c7557b7aef75d0f4611197481.tar.gz
chromium_src-b7534558c6366d9c7557b7aef75d0f4611197481.tar.bz2
Fixes resize bug where we would incorrectly force window to be in work
area, resulting in janktastic resize. BUG=119244 TEST=covered by unit tests R=ben@chromium.org Review URL: http://codereview.chromium.org/9769017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_resizer.cc')
-rw-r--r--ash/wm/window_resizer.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/wm/window_resizer.cc b/ash/wm/window_resizer.cc
index e0dcdb5..a64fd56 100644
--- a/ash/wm/window_resizer.cc
+++ b/ash/wm/window_resizer.cc
@@ -202,8 +202,9 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag(
gfx::Rect new_bounds(origin, size);
// Update bottom edge to stay in the work area when we are resizing
// by dragging the bottome edge or corners.
- if (details.bounds_change & kBoundsChange_Resizes &&
- origin.y() == details.window->bounds().y()) {
+ if (details.window_component == HTBOTTOM ||
+ details.window_component == HTBOTTOMRIGHT ||
+ details.window_component == HTBOTTOMLEFT) {
gfx::Rect work_area = gfx::Screen::GetMonitorWorkAreaNearestWindow(
details.window);
if (new_bounds.bottom() > work_area.bottom())