| Index: ash/wm/toplevel_window_event_handler.cc
|
| diff --git a/ash/wm/toplevel_window_event_handler.cc b/ash/wm/toplevel_window_event_handler.cc
|
| index f20a13fc7dd2b90e8601a284defbc3a6d5236783..a63a64d8befc39ecd121503c2c98ae16f93ed985 100644
|
| --- a/ash/wm/toplevel_window_event_handler.cc
|
| +++ b/ash/wm/toplevel_window_event_handler.cc
|
| @@ -76,7 +76,8 @@ gfx::Point ConvertPointToParent(aura::Window* window,
|
|
|
| // Returns the window component containing |event|'s location.
|
| int GetWindowComponent(aura::Window* window, const ui::LocatedEvent& event) {
|
| - return window->delegate()->GetNonClientComponent(event.location());
|
| + return window->delegate()->GetNonClientComponent(
|
| + gfx::ToFlooredPoint(event.location()));
|
| }
|
|
|
| } // namespace
|
| @@ -290,7 +291,7 @@ void ToplevelWindowEventHandler::OnGestureEvent(ui::GestureEvent* event) {
|
| if (!CanStartOneFingerDrag(component))
|
| return;
|
| gfx::Point location_in_parent(
|
| - ConvertPointToParent(target, event->location()));
|
| + ConvertPointToParent(target, gfx::ToFlooredPoint(event->location())));
|
| AttemptToStartDrag(target, location_in_parent, component,
|
| aura::client::WINDOW_MOVE_SOURCE_TOUCH);
|
| event->StopPropagation();
|
| @@ -473,7 +474,7 @@ void ToplevelWindowEventHandler::HandleMousePressed(
|
| (ui::EF_IS_DOUBLE_CLICK | ui::EF_IS_TRIPLE_CLICK)) == 0 &&
|
| WindowResizer::GetBoundsChangeForWindowComponent(component)) {
|
| gfx::Point location_in_parent(
|
| - ConvertPointToParent(target, event->location()));
|
| + ConvertPointToParent(target, gfx::ToFlooredPoint(event->location())));
|
| AttemptToStartDrag(target, location_in_parent, component,
|
| aura::client::WINDOW_MOVE_SOURCE_MOUSE);
|
| // Set as handled so that other event handlers do no act upon the event
|
| @@ -521,7 +522,8 @@ void ToplevelWindowEventHandler::HandleDrag(
|
| if (!window_resizer_)
|
| return;
|
| window_resizer_->resizer()->Drag(
|
| - ConvertPointToParent(target, event->location()), event->flags());
|
| + ConvertPointToParent(target, gfx::ToFlooredPoint(event->location())),
|
| + event->flags());
|
| event->StopPropagation();
|
| }
|
|
|
| @@ -540,8 +542,8 @@ void ToplevelWindowEventHandler::HandleMouseMoved(
|
| Shell::GetInstance()->resize_shadow_controller();
|
| if (controller) {
|
| if (event->flags() & ui::EF_IS_NON_CLIENT) {
|
| - int component =
|
| - target->delegate()->GetNonClientComponent(event->location());
|
| + int component = target->delegate()->GetNonClientComponent(
|
| + gfx::ToFlooredPoint(event->location()));
|
| controller->ShowShadow(target, component);
|
| } else {
|
| controller->HideShadow(target);
|
|
|