| Index: ash/common/shelf/shelf_tooltip_manager.cc
|
| diff --git a/ash/common/shelf/shelf_tooltip_manager.cc b/ash/common/shelf/shelf_tooltip_manager.cc
|
| deleted file mode 100644
|
| index 8cab3d316cc7f1a50cc849cf4d24ce91c7a25697..0000000000000000000000000000000000000000
|
| --- a/ash/common/shelf/shelf_tooltip_manager.cc
|
| +++ /dev/null
|
| @@ -1,263 +0,0 @@
|
| -// Copyright 2013 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/common/shelf/shelf_tooltip_manager.h"
|
| -
|
| -#include "ash/common/shelf/shelf_view.h"
|
| -#include "ash/common/shelf/wm_shelf.h"
|
| -#include "ash/common/wm_shell.h"
|
| -#include "ash/common/wm_window.h"
|
| -#include "ash/public/cpp/shell_window_ids.h"
|
| -#include "ash/root_window_controller.h"
|
| -#include "ash/system/tray/tray_constants.h"
|
| -#include "base/bind.h"
|
| -#include "base/strings/string16.h"
|
| -#include "base/threading/thread_task_runner_handle.h"
|
| -#include "base/time/time.h"
|
| -#include "ui/base/material_design/material_design_controller.h"
|
| -#include "ui/events/event.h"
|
| -#include "ui/events/event_constants.h"
|
| -#include "ui/gfx/geometry/insets.h"
|
| -#include "ui/views/bubble/bubble_dialog_delegate.h"
|
| -#include "ui/views/controls/label.h"
|
| -#include "ui/views/layout/fill_layout.h"
|
| -#include "ui/views/widget/widget.h"
|
| -
|
| -namespace ash {
|
| -namespace {
|
| -
|
| -const int kTooltipAppearanceDelay = 1000; // msec
|
| -
|
| -// Tooltip layout constants.
|
| -
|
| -// Shelf item tooltip height.
|
| -const int kTooltipHeight = 24;
|
| -
|
| -// The maximum width of the tooltip bubble. Borrowed the value from
|
| -// ash/tooltip/tooltip_controller.cc
|
| -const int kTooltipMaxWidth = 250;
|
| -
|
| -// Shelf item tooltip internal text margins.
|
| -const int kTooltipTopBottomMargin = 4;
|
| -const int kTooltipLeftRightMargin = 8;
|
| -
|
| -// The offset for the tooltip bubble - making sure that the bubble is spaced
|
| -// with a fixed gap. The gap is accounted for by the transparent arrow in the
|
| -// bubble and an additional 1px padding for the shelf item views.
|
| -const int kArrowTopBottomOffset = 1;
|
| -const int kArrowLeftRightOffset = 1;
|
| -
|
| -// Tooltip's border interior thickness that defines its minimum height.
|
| -const int kBorderInteriorThickness = kTooltipHeight / 2;
|
| -
|
| -} // namespace
|
| -
|
| -// The implementation of tooltip of the launcher.
|
| -class ShelfTooltipManager::ShelfTooltipBubble
|
| - : public views::BubbleDialogDelegateView {
|
| - public:
|
| - ShelfTooltipBubble(views::View* anchor,
|
| - views::BubbleBorder::Arrow arrow,
|
| - const base::string16& text)
|
| - : views::BubbleDialogDelegateView(anchor, arrow) {
|
| - set_close_on_deactivate(false);
|
| - set_can_activate(false);
|
| - set_accept_events(false);
|
| - set_margins(gfx::Insets(kTooltipTopBottomMargin, kTooltipLeftRightMargin));
|
| - set_shadow(views::BubbleBorder::NO_ASSETS);
|
| - SetLayoutManager(new views::FillLayout());
|
| - views::Label* label = new views::Label(text);
|
| - label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
|
| - ui::NativeTheme* theme = anchor->GetWidget()->GetNativeTheme();
|
| - label->SetEnabledColor(
|
| - theme->GetSystemColor(ui::NativeTheme::kColorId_TooltipText));
|
| - SkColor background_color =
|
| - theme->GetSystemColor(ui::NativeTheme::kColorId_TooltipBackground);
|
| - set_color(background_color);
|
| - label->SetBackgroundColor(background_color);
|
| - // The background is not opaque, so we can't do subpixel rendering.
|
| - label->SetSubpixelRenderingEnabled(false);
|
| - AddChildView(label);
|
| -
|
| - gfx::Insets insets(kArrowTopBottomOffset, kArrowLeftRightOffset);
|
| - // Adjust the anchor location for asymmetrical borders of shelf item.
|
| - if (anchor->border())
|
| - insets += anchor->border()->GetInsets();
|
| - if (ui::MaterialDesignController::IsSecondaryUiMaterial())
|
| - insets += gfx::Insets(-kBubblePaddingHorizontalBottom);
|
| - set_anchor_view_insets(insets);
|
| -
|
| - views::BubbleDialogDelegateView::CreateBubble(this);
|
| - if (!ui::MaterialDesignController::IsSecondaryUiMaterial()) {
|
| - // These must both be called after CreateBubble.
|
| - SetArrowPaintType(views::BubbleBorder::PAINT_TRANSPARENT);
|
| - SetBorderInteriorThickness(kBorderInteriorThickness);
|
| - }
|
| - }
|
| -
|
| - private:
|
| - // BubbleDialogDelegateView overrides:
|
| - gfx::Size GetPreferredSize() const override {
|
| - const gfx::Size size = BubbleDialogDelegateView::GetPreferredSize();
|
| - const int kTooltipMinHeight = kTooltipHeight - 2 * kTooltipTopBottomMargin;
|
| - return gfx::Size(std::min(size.width(), kTooltipMaxWidth),
|
| - std::max(size.height(), kTooltipMinHeight));
|
| - }
|
| -
|
| - void OnBeforeBubbleWidgetInit(views::Widget::InitParams* params,
|
| - views::Widget* bubble_widget) const override {
|
| - // Place the bubble in the same display as the anchor.
|
| - WmWindow::Get(anchor_widget()->GetNativeWindow())
|
| - ->GetRootWindowController()
|
| - ->ConfigureWidgetInitParamsForContainer(
|
| - bubble_widget, kShellWindowId_SettingBubbleContainer, params);
|
| - }
|
| -
|
| - int GetDialogButtons() const override { return ui::DIALOG_BUTTON_NONE; }
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(ShelfTooltipBubble);
|
| -};
|
| -
|
| -ShelfTooltipManager::ShelfTooltipManager(ShelfView* shelf_view)
|
| - : timer_delay_(kTooltipAppearanceDelay),
|
| - shelf_view_(shelf_view),
|
| - bubble_(nullptr),
|
| - weak_factory_(this) {
|
| - shelf_view_->wm_shelf()->AddObserver(this);
|
| - WmShell::Get()->AddPointerWatcher(this,
|
| - views::PointerWatcherEventTypes::BASIC);
|
| -}
|
| -
|
| -ShelfTooltipManager::~ShelfTooltipManager() {
|
| - WmShell::Get()->RemovePointerWatcher(this);
|
| - shelf_view_->wm_shelf()->RemoveObserver(this);
|
| - WmWindow* window = nullptr;
|
| - if (shelf_view_->GetWidget())
|
| - window = WmWindow::Get(shelf_view_->GetWidget()->GetNativeWindow());
|
| - if (window)
|
| - window->RemoveLimitedPreTargetHandler(this);
|
| -}
|
| -
|
| -void ShelfTooltipManager::Init() {
|
| - WmWindow* window = WmWindow::Get(shelf_view_->GetWidget()->GetNativeWindow());
|
| - window->AddLimitedPreTargetHandler(this);
|
| -}
|
| -
|
| -void ShelfTooltipManager::Close() {
|
| - timer_.Stop();
|
| - if (bubble_)
|
| - bubble_->GetWidget()->Close();
|
| - bubble_ = nullptr;
|
| -}
|
| -
|
| -bool ShelfTooltipManager::IsVisible() const {
|
| - return bubble_ && bubble_->GetWidget()->IsVisible();
|
| -}
|
| -
|
| -views::View* ShelfTooltipManager::GetCurrentAnchorView() const {
|
| - return bubble_ ? bubble_->GetAnchorView() : nullptr;
|
| -}
|
| -
|
| -void ShelfTooltipManager::ShowTooltip(views::View* view) {
|
| - timer_.Stop();
|
| - if (bubble_) {
|
| - // Cancel the hiding animation to hide the old bubble immediately.
|
| - WmWindow::Get(bubble_->GetWidget()->GetNativeWindow())
|
| - ->SetVisibilityAnimationTransition(::wm::ANIMATE_NONE);
|
| - Close();
|
| - }
|
| -
|
| - if (!ShouldShowTooltipForView(view))
|
| - return;
|
| -
|
| - views::BubbleBorder::Arrow arrow = views::BubbleBorder::Arrow::NONE;
|
| - switch (shelf_view_->wm_shelf()->GetAlignment()) {
|
| - case SHELF_ALIGNMENT_BOTTOM:
|
| - case SHELF_ALIGNMENT_BOTTOM_LOCKED:
|
| - arrow = views::BubbleBorder::BOTTOM_CENTER;
|
| - break;
|
| - case SHELF_ALIGNMENT_LEFT:
|
| - arrow = views::BubbleBorder::LEFT_CENTER;
|
| - break;
|
| - case SHELF_ALIGNMENT_RIGHT:
|
| - arrow = views::BubbleBorder::RIGHT_CENTER;
|
| - break;
|
| - }
|
| -
|
| - base::string16 text = shelf_view_->GetTitleForView(view);
|
| - bubble_ = new ShelfTooltipBubble(view, arrow, text);
|
| - WmWindow* window = WmWindow::Get(bubble_->GetWidget()->GetNativeWindow());
|
| - window->SetVisibilityAnimationType(
|
| - ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
|
| - window->SetVisibilityAnimationTransition(::wm::ANIMATE_HIDE);
|
| - bubble_->GetWidget()->Show();
|
| -}
|
| -
|
| -void ShelfTooltipManager::ShowTooltipWithDelay(views::View* view) {
|
| - if (ShouldShowTooltipForView(view)) {
|
| - timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(timer_delay_),
|
| - base::Bind(&ShelfTooltipManager::ShowTooltip,
|
| - weak_factory_.GetWeakPtr(), view));
|
| - }
|
| -}
|
| -
|
| -void ShelfTooltipManager::OnPointerEventObserved(
|
| - const ui::PointerEvent& event,
|
| - const gfx::Point& location_in_screen,
|
| - views::Widget* target) {
|
| - // Close on any press events inside or outside the tooltip.
|
| - if (event.type() == ui::ET_POINTER_DOWN)
|
| - Close();
|
| -}
|
| -
|
| -void ShelfTooltipManager::OnMouseEvent(ui::MouseEvent* event) {
|
| - if (event->type() == ui::ET_MOUSE_EXITED) {
|
| - Close();
|
| - return;
|
| - }
|
| -
|
| - if (event->type() != ui::ET_MOUSE_MOVED)
|
| - return;
|
| -
|
| - gfx::Point point = event->location();
|
| - views::View::ConvertPointFromWidget(shelf_view_, &point);
|
| - views::View* view = shelf_view_->GetTooltipHandlerForPoint(point);
|
| - const bool should_show = ShouldShowTooltipForView(view);
|
| -
|
| - timer_.Stop();
|
| - if (IsVisible() && should_show && bubble_->GetAnchorView() != view)
|
| - ShowTooltip(view);
|
| - else if (!IsVisible() && should_show)
|
| - ShowTooltipWithDelay(view);
|
| - else if (IsVisible() && shelf_view_->ShouldHideTooltip(point))
|
| - Close();
|
| -}
|
| -
|
| -void ShelfTooltipManager::WillChangeVisibilityState(
|
| - ShelfVisibilityState new_state) {
|
| - if (new_state == SHELF_HIDDEN)
|
| - Close();
|
| -}
|
| -
|
| -void ShelfTooltipManager::OnAutoHideStateChanged(ShelfAutoHideState new_state) {
|
| - if (new_state == SHELF_AUTO_HIDE_HIDDEN) {
|
| - timer_.Stop();
|
| - // AutoHide state change happens during an event filter, so immediate close
|
| - // may cause a crash in the HandleMouseEvent() after the filter. So we just
|
| - // schedule the Close here.
|
| - base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(&ShelfTooltipManager::Close, weak_factory_.GetWeakPtr()));
|
| - }
|
| -}
|
| -
|
| -bool ShelfTooltipManager::ShouldShowTooltipForView(views::View* view) {
|
| - WmShelf* shelf = shelf_view_ ? shelf_view_->wm_shelf() : nullptr;
|
| - return shelf && shelf_view_->ShouldShowTooltipForView(view) &&
|
| - (shelf->GetVisibilityState() == SHELF_VISIBLE ||
|
| - (shelf->GetVisibilityState() == SHELF_AUTO_HIDE &&
|
| - shelf->GetAutoHideState() == SHELF_AUTO_HIDE_SHOWN));
|
| -}
|
| -
|
| -} // namespace ash
|
|
|