| Index: ui/views/controls/resize_area.cc
|
| diff --git a/ui/views/controls/resize_area.cc b/ui/views/controls/resize_area.cc
|
| index 06c0325fea38f89ea9da767478384578afb8c526..3698078d709d6986907ef91eabafdb0e110cc3e2 100644
|
| --- a/ui/views/controls/resize_area.cc
|
| +++ b/ui/views/controls/resize_area.cc
|
| @@ -13,6 +13,9 @@
|
| namespace views {
|
|
|
| const char ResizeArea::kViewClassName[] = "ResizeArea";
|
| +
|
| +////////////////////////////////////////////////////////////////////////////////
|
| +// ResizeArea
|
|
|
| ResizeArea::ResizeArea(ResizeAreaDelegate* delegate)
|
| : delegate_(delegate),
|
| @@ -31,25 +34,17 @@
|
| : gfx::kNullCursor;
|
| }
|
|
|
| -void ResizeArea::OnGestureEvent(ui::GestureEvent* event) {
|
| - if (event->type() == ui::ET_GESTURE_TAP_DOWN) {
|
| - SetInitialPosition(event->x());
|
| - event->SetHandled();
|
| - } else if (event->type() == ui::ET_GESTURE_SCROLL_BEGIN ||
|
| - event->type() == ui::ET_GESTURE_SCROLL_UPDATE) {
|
| - ReportResizeAmount(event->x(), false);
|
| - event->SetHandled();
|
| - } else if (event->type() == ui::ET_GESTURE_END) {
|
| - ReportResizeAmount(event->x(), true);
|
| - event->SetHandled();
|
| - }
|
| -}
|
| -
|
| bool ResizeArea::OnMousePressed(const ui::MouseEvent& event) {
|
| if (!event.IsOnlyLeftMouseButton())
|
| return false;
|
|
|
| - SetInitialPosition(event.x());
|
| + // The resize area obviously will move once you start dragging so we need to
|
| + // convert coordinates to screen coordinates so that we don't lose our
|
| + // bearings.
|
| + gfx::Point point(event.x(), 0);
|
| + View::ConvertPointToScreen(this, &point);
|
| + initial_position_ = point.x();
|
| +
|
| return true;
|
| }
|
|
|
| @@ -81,10 +76,4 @@
|
| last_update);
|
| }
|
|
|
| -void ResizeArea::SetInitialPosition(int event_x) {
|
| - gfx::Point point(event_x, 0);
|
| - View::ConvertPointToScreen(this, &point);
|
| - initial_position_ = point.x();
|
| -}
|
| -
|
| } // namespace views
|
|
|