diff options
Diffstat (limited to 'ui/views/controls/menu/menu_controller.cc')
-rw-r--r-- | ui/views/controls/menu/menu_controller.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc index 87eeca4..796b45f 100644 --- a/ui/views/controls/menu/menu_controller.cc +++ b/ui/views/controls/menu/menu_controller.cc @@ -450,10 +450,8 @@ void MenuController::OnMouseDragged(SubmenuView* source, return; if (possible_drag_) { - if (View::ExceededDragThreshold(event.x() - press_pt_.x(), - event.y() - press_pt_.y())) { + if (View::ExceededDragThreshold(event.location() - press_pt_)) StartDrag(source, press_pt_); - } return; } MenuItemView* mouse_menu = NULL; @@ -859,7 +857,8 @@ void MenuController::StartDrag(SubmenuView* source, OSExchangeData data; item->GetDelegate()->WriteDragData(item, &data); - drag_utils::SetDragImageOnDataObject(*canvas, item->size(), press_loc, + drag_utils::SetDragImageOnDataObject(*canvas, item->size(), + press_loc.OffsetFromOrigin(), &data); StopScrolling(); int drag_ops = item->GetDelegate()->GetDragOperations(item); |