Align the base of the shelf's context menu to the top edge of the shelf.

ash/shelf/shelf_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shelf/shelf_view.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "ash/ash_constants.h"
 #include "ash/drag_drop/drag_image_view.h"
 #include "ash/public/cpp/shelf_item_delegate.h"
 #include "ash/scoped_root_window_for_new_windows.h"
 #include "ash/shelf/app_list_button.h"
 #include "ash/shelf/overflow_bubble.h"
 #include "ash/shelf/overflow_bubble_view.h"
 #include "ash/shelf/overflow_button.h"
 #include "ash/shelf/shelf_application_menu_model.h"
 #include "ash/shelf/shelf_button.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_port.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/wm/root_window_finder.h"
+#include "ash/wm/wm_screen_util.h"
 #include "ash/wm_window.h"
 #include "base/auto_reset.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
@@ skipping 1554 matching lines @@
     }
   }
   // The menu clears |scoped_root_window_for_new_windows_| in OnMenuClosed.
   if (!IsShowingMenu())
     scoped_root_window_for_new_windows_.reset();
 }
 
 void ShelfView::ShowContextMenuForView(views::View* source,
                                        const gfx::Point& point,
                                        ui::MenuSourceType source_type) {
+  WmWindow* shelf_window = WmWindow::Get(shelf_widget_->GetNativeWindow());

[msw, 2017/05/05 17:34:18]

nit: add a comment to this block of code, like "Align the context menu to the
edge of the shelf."

[minch1, 2017/05/08 17:21:02]

Done.

+  gfx::Rect shelf_bounds =
+      is_overflow_mode()
+          ? (owner_overflow_bubble_->bubble_view()->GetBubbleBounds())
+          : (wm::GetDisplayBoundsInParent(shelf_window));

[msw, 2017/05/05 17:34:18]

You'll probably need to refactor this as per
https://codereview.chromium.org/2860163005/

+
+  gfx::Point point_aligned_shelf;

[msw, 2017/05/05 17:34:18]

nit: consider |menu_point| or |context_menu_point|.

[minch1, 2017/05/08 17:21:02]

Done.

+  switch (wm_shelf_->GetAlignment()) {
+    case SHELF_ALIGNMENT_BOTTOM:
+    case SHELF_ALIGNMENT_BOTTOM_LOCKED:
+      point_aligned_shelf.SetPoint(point.x(),
+                                   shelf_bounds.bottom() - kShelfSize);

[msw, 2017/05/05 17:34:19]

Why not just use shelf_bounds.y()?

[minch1, 2017/05/08 17:21:02]

This is fine for overflow mode, if it is not. The shelf_bounds actually is the
whole screen, left point of the Rect is (0, 0) with the screen's width and
height.
So, here if use shelf_bounds.y(), it will be 0 for none overflow mode. Then, the
context menu will shown on the top of the screen.

+      break;
+    case SHELF_ALIGNMENT_LEFT:
+      point_aligned_shelf.SetPoint(shelf_bounds.x() + kShelfSize, point.y());

[msw, 2017/05/05 17:34:19]

Ditto: why not just use shelf_bounds.right()?

+      break;
+    case SHELF_ALIGNMENT_RIGHT:
+      point_aligned_shelf.SetPoint(shelf_bounds.right() - kShelfSize,

[msw, 2017/05/05 17:34:19]

Ditto: why not just use shelf_bounds.x()?

+                                   point.y());
+    default:

[msw, 2017/05/05 17:34:19]

Remove the default case, so if anyone adds a new alignment they'll update this
switch.

+      break;
+  }
   last_pressed_index_ = -1;
 
   const ShelfItem* item = ShelfItemForView(source);
   if (!item) {
-    ShellPort::Get()->ShowContextMenu(point, source_type);
+    ShellPort::Get()->ShowContextMenu(point_aligned_shelf, source_type);
     return;
   }
 
   std::unique_ptr<ui::MenuModel> context_menu_model(
       Shell::Get()->shell_delegate()->CreateContextMenu(wm_shelf_, item));
   if (!context_menu_model)
     return;
 
   context_menu_id_ = item ? item->id : 0;
-  ShowMenu(std::move(context_menu_model), source, point, true, source_type,
-           nullptr);
+  ShowMenu(std::move(context_menu_model), source, point_aligned_shelf, true,
+           source_type, nullptr);
 }
 
 void ShelfView::ShowMenu(std::unique_ptr<ui::MenuModel> menu_model,
                          views::View* source,
                          const gfx::Point& click_point,
                          bool context_menu,
                          ui::MenuSourceType source_type,
                          views::InkDrop* ink_drop) {
   menu_model_ = std::move(menu_model);
   menu_model_adapter_.reset(new views::MenuModelAdapter(
       menu_model_.get(),
       base::Bind(&ShelfView::OnMenuClosed, base::Unretained(this), ink_drop)));
 
   closing_event_time_ = base::TimeTicks();
   int run_types = 0;
   if (context_menu)
     run_types |= views::MenuRunner::CONTEXT_MENU;
   launcher_menu_runner_.reset(
       new views::MenuRunner(menu_model_adapter_->CreateMenu(), run_types));
 
   // Place new windows on the same display as the button that spawned the menu.
   WmWindow* window = WmWindow::Get(source->GetWidget()->GetNativeWindow());
   scoped_root_window_for_new_windows_.reset(
       new ScopedRootWindowForNewWindows(window->GetRootWindow()));
 
   views::MenuAnchorPosition menu_alignment = views::MENU_ANCHOR_TOPLEFT;
   gfx::Rect anchor = gfx::Rect(click_point, gfx::Size());
 
+  ShelfAlignment shelf_alignment = wm_shelf_->GetAlignment();
   if (!context_menu) {
     // Application lists use a bubble.
     // It is possible to invoke the menu while it is sliding into view. To cover
     // that case, the screen coordinates are offsetted by the animation delta.
     anchor = source->GetBoundsInScreen() + (window->GetTargetBounds().origin() -
                                             window->GetBounds().origin());
 
     // Adjust the anchor location for shelf items with asymmetrical borders.
     if (source->border())
       anchor.Inset(source->border()->GetInsets());
 
     // Determine the menu alignment dependent on the shelf.
-    switch (wm_shelf_->GetAlignment()) {
+    switch (shelf_alignment) {
       case SHELF_ALIGNMENT_BOTTOM:
       case SHELF_ALIGNMENT_BOTTOM_LOCKED:
         menu_alignment = views::MENU_ANCHOR_BUBBLE_ABOVE;
         break;
       case SHELF_ALIGNMENT_LEFT:
         menu_alignment = views::MENU_ANCHOR_BUBBLE_RIGHT;
         break;
       case SHELF_ALIGNMENT_RIGHT:
         menu_alignment = views::MENU_ANCHOR_BUBBLE_LEFT;
         break;
     }
   }
 
+  // Distinguish the touch events that triggered on the bottom shelf or
+  // left / right shelf. Since they should have different |MenuAnchorPosition|.
+  if (source_type == ui::MENU_SOURCE_TOUCH &&
+      (shelf_alignment == SHELF_ALIGNMENT_LEFT ||

[msw, 2017/05/05 17:34:18]

Use !WmShelf::IsHorizontalAlignment() instead, and remove the |shelf_alignment|
local.

+       shelf_alignment == SHELF_ALIGNMENT_RIGHT)) {
+    source_type = ui::MENU_SOURCE_TOUCH_SIDE_SHELF;
+  }
   // NOTE: if you convert to HAS_MNEMONICS be sure to update menu building code.
   launcher_menu_runner_->RunMenuAt(source->GetWidget(), nullptr, anchor,
                                    menu_alignment, source_type);
 }
 
 void ShelfView::OnMenuClosed(views::InkDrop* ink_drop) {
   context_menu_id_ = 0;
 
   // Hide the hide overflow bubble after showing a context menu for its items.
   if (owner_overflow_bubble_)
@@ skipping 66 matching lines @@
   // Bail if dragging has already begun, or if no item has been pressed.
   if (dragging() || !drag_view_)
     return false;
 
   // Dragging only begins once the pointer has travelled a minimum distance.
   if ((std::abs(event.x() - drag_origin_.x()) < kMinimumDragDistance) &&
       (std::abs(event.y() - drag_origin_.y()) < kMinimumDragDistance)) {
     return false;
   }
 
-  // Touch dragging only begins after a dealy from the press event. This
+  // Touch dragging only begins after a delay from the press event. This
   // prevents accidental dragging on swipe or scroll gestures.
   if (pointer == TOUCH &&
       (base::TimeTicks::Now() - touch_press_time_) <
           base::TimeDelta::FromMilliseconds(kTouchDragTimeThresholdMs)) {
     return false;
   }
 
   return true;
 }
 
 }  // namespace ash