diff options
| author | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-07 22:36:42 +0000 |
|---|---|---|
| committer | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-07 22:36:42 +0000 |
| commit | 2b2273f385daa81166c938ba5c1cde76caeaf629 (patch) | |
| tree | ec8f857ec61aeed106b6931e7a7f423021142bbe /ash/wm/gestures | |
| parent | baefae90f294a981c973bffbdd3eccabfe796b6a (diff) | |
| download | chromium_src-2b2273f385daa81166c938ba5c1cde76caeaf629.zip chromium_src-2b2273f385daa81166c938ba5c1cde76caeaf629.tar.gz chromium_src-2b2273f385daa81166c938ba5c1cde76caeaf629.tar.bz2 | |
Snap resize windows on touch to 50% when the maximize button is close to the border
BUG=151101
TEST=visual & unit test
Review URL: https://chromiumcodereview.appspot.com/11366099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/gestures')
| -rw-r--r-- | ash/wm/gestures/system_pinch_handler.cc | 3 | ||||
| -rw-r--r-- | ash/wm/gestures/two_finger_drag_handler.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ash/wm/gestures/system_pinch_handler.cc b/ash/wm/gestures/system_pinch_handler.cc index 2f519b0..f34836c 100644 --- a/ash/wm/gestures/system_pinch_handler.cc +++ b/ash/wm/gestures/system_pinch_handler.cc @@ -95,7 +95,8 @@ SystemGestureStatus SystemPinchHandler::ProcessGestureEvent( SnapSizer sizer(target_, gfx::Point(), event.details().swipe_left() ? internal::SnapSizer::LEFT_EDGE : - internal::SnapSizer::RIGHT_EDGE); + internal::SnapSizer::RIGHT_EDGE, + internal::SnapSizer::OTHER_INPUT); target_->SetBounds(sizer.GetSnapBounds(target_->bounds())); } else if (event.details().swipe_up()) { if (!wm::IsWindowMaximized(target_) && diff --git a/ash/wm/gestures/two_finger_drag_handler.cc b/ash/wm/gestures/two_finger_drag_handler.cc index 7ed214a..a450a27 100644 --- a/ash/wm/gestures/two_finger_drag_handler.cc +++ b/ash/wm/gestures/two_finger_drag_handler.cc @@ -136,7 +136,8 @@ bool TwoFingerDragHandler::ProcessGestureEvent(aura::Window* target, internal::SnapSizer sizer(target, gfx::Point(), event.details().swipe_left() ? internal::SnapSizer::LEFT_EDGE : - internal::SnapSizer::RIGHT_EDGE); + internal::SnapSizer::RIGHT_EDGE, + internal::SnapSizer::OTHER_INPUT); ui::ScopedLayerAnimationSettings scoped_setter( target->layer()->GetAnimator()); |