diff options
Diffstat (limited to 'ash/shelf/app_list_button.cc')
| -rw-r--r-- | ash/shelf/app_list_button.cc | 146 |
1 files changed, 95 insertions, 51 deletions
diff --git a/ash/shelf/app_list_button.cc b/ash/shelf/app_list_button.cc index 8b1aca5..d1246c8 100644 --- a/ash/shelf/app_list_button.cc +++ b/ash/shelf/app_list_button.cc @@ -1,14 +1,17 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 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/app_list_button.h" -#include <vector> - #include "ash/ash_constants.h" +#include "ash/ash_switches.h" +#include "ash/shelf/shelf_button.h" #include "ash/shelf/shelf_button_host.h" -#include "ash/shelf/shelf_constants.h" +#include "ash/shelf/shelf_item_types.h" +#include "ash/shelf/shelf_layout_manager.h" +#include "ash/shelf/shelf_widget.h" +#include "ash/shell.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" #include "ui/accessibility/ax_view_state.h" @@ -18,27 +21,24 @@ #include "ui/compositor/layer_animation_element.h" #include "ui/compositor/layer_animation_sequence.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/gfx/canvas.h" +#include "ui/gfx/image/image_skia_operations.h" +#include "ui/views/controls/button/image_button.h" #include "ui/views/painter.h" namespace ash { +// static +const int AppListButton::kImageBoundsSize = 7; -const int kAnimationDurationInMs = 600; -const float kAnimationOpacity[] = { 1.0f, 0.4f, 1.0f }; AppListButton::AppListButton(views::ButtonListener* listener, - ShelfButtonHost* host) + ShelfButtonHost* host, + ShelfWidget* shelf_widget) : views::ImageButton(listener), - host_(host) { - ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); - SetImage(views::CustomButton::STATE_NORMAL, - rb.GetImageNamed(IDR_ASH_SHELF_ICON_APPLIST).ToImageSkia()); - SetImage(views::CustomButton::STATE_HOVERED, - rb.GetImageNamed(IDR_ASH_SHELF_ICON_APPLIST_HOT).ToImageSkia()); - SetImage(views::CustomButton::STATE_PRESSED, - rb.GetImageNamed(IDR_ASH_SHELF_ICON_APPLIST_PUSHED).ToImageSkia()); + host_(host), + shelf_widget_(shelf_widget) { SetAccessibleName(l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE)); - SetSize(gfx::Size(kShelfPreferredSize, kShelfPreferredSize)); - SetImageAlignment(ImageButton::ALIGN_CENTER, ImageButton::ALIGN_TOP); + SetSize(gfx::Size(kShelfSize, kShelfSize)); SetFocusPainter(views::Painter::CreateSolidFocusPainter( kFocusBorderColor, gfx::Insets(1, 1, 1, 1))); } @@ -46,40 +46,6 @@ AppListButton::AppListButton(views::ButtonListener* listener, AppListButton::~AppListButton() { } -void AppListButton::StartLoadingAnimation() { - layer()->GetAnimator()->StopAnimating(); - - scoped_ptr<ui::LayerAnimationSequence> opacity_sequence( - new ui::LayerAnimationSequence()); - - opacity_sequence->set_is_cyclic(true); - - for (size_t i = 0; i < arraysize(kAnimationOpacity); ++i) { - opacity_sequence->AddElement( - ui::LayerAnimationElement::CreateOpacityElement( - kAnimationOpacity[i], - base::TimeDelta::FromMilliseconds(kAnimationDurationInMs))); - } - - opacity_sequence->AddElement( - ui::LayerAnimationElement::CreatePauseElement( - ui::LayerAnimationElement::OPACITY, - base::TimeDelta::FromMilliseconds(kAnimationDurationInMs))); - - // LayerAnimator takes ownership of the sequences. - layer()->GetAnimator()->ScheduleAnimation(opacity_sequence.release()); -} - -void AppListButton::StopLoadingAnimation() { - layer()->GetAnimator()->StopAnimating(); - - ui::ScopedLayerAnimationSettings settings(layer()->GetAnimator()); - settings.SetTransitionDuration( - base::TimeDelta::FromMilliseconds(kAnimationDurationInMs)); - layer()->SetOpacity(1.0f); - layer()->SetTransform(gfx::Transform()); -} - bool AppListButton::OnMousePressed(const ui::MouseEvent& event) { ImageButton::OnMousePressed(event); host_->PointerPressedOnButton(this, ShelfButtonHost::MOUSE, event); @@ -117,6 +83,84 @@ void AppListButton::OnMouseExited(const ui::MouseEvent& event) { host_->MouseExitedButton(this); } +void AppListButton::OnGestureEvent(ui::GestureEvent* event) { + switch (event->type()) { + case ui::ET_GESTURE_SCROLL_BEGIN: + host_->PointerPressedOnButton(this, ShelfButtonHost::TOUCH, *event); + event->SetHandled(); + return; + case ui::ET_GESTURE_SCROLL_UPDATE: + host_->PointerDraggedOnButton(this, ShelfButtonHost::TOUCH, *event); + event->SetHandled(); + return; + case ui::ET_GESTURE_SCROLL_END: + case ui::ET_SCROLL_FLING_START: + host_->PointerReleasedOnButton(this, ShelfButtonHost::TOUCH, false); + event->SetHandled(); + return; + default: + ImageButton::OnGestureEvent(event); + return; + } +} + +void AppListButton::OnPaint(gfx::Canvas* canvas) { + // Call the base class first to paint any background/borders. + View::OnPaint(canvas); + + int background_image_id = 0; + if (Shell::GetInstance()->GetAppListTargetVisibility()) { + background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_PRESSED; + } else { + if (shelf_widget_->GetDimsShelf()) + background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_ON_BLACK; + else + background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_NORMAL; + } + ResourceBundle& rb = ResourceBundle::GetSharedInstance(); + const gfx::ImageSkia* background_image = + rb.GetImageNamed(background_image_id).ToImageSkia(); + const gfx::ImageSkia* forground_image = + rb.GetImageNamed(IDR_ASH_SHELF_ICON_APPLIST).ToImageSkia(); + + gfx::Rect contents_bounds = GetContentsBounds(); + gfx::Rect background_bounds, forground_bounds; + + ShelfAlignment alignment = shelf_widget_->GetAlignment(); + background_bounds.set_size(background_image->size()); + if (alignment == SHELF_ALIGNMENT_LEFT) { + background_bounds.set_x(contents_bounds.width() - + ShelfLayoutManager::kShelfItemInset - background_image->width()); + background_bounds.set_y(contents_bounds.y() + + (contents_bounds.height() - background_image->height()) / 2); + } else if(alignment == SHELF_ALIGNMENT_RIGHT) { + background_bounds.set_x(ShelfLayoutManager::kShelfItemInset); + background_bounds.set_y(contents_bounds.y() + + (contents_bounds.height() - background_image->height()) / 2); + } else { + background_bounds.set_y(ShelfLayoutManager::kShelfItemInset); + background_bounds.set_x(contents_bounds.x() + + (contents_bounds.width() - background_image->width()) / 2); + } + + forground_bounds.set_size(forground_image->size()); + forground_bounds.set_x(background_bounds.x() + + std::max(0, + (background_bounds.width() - forground_bounds.width()) / 2)); + forground_bounds.set_y(background_bounds.y() + + std::max(0, + (background_bounds.height() - forground_bounds.height()) / 2)); + + canvas->DrawImageInt(*background_image, + background_bounds.x(), + background_bounds.y()); + canvas->DrawImageInt(*forground_image, + forground_bounds.x(), + forground_bounds.y()); + + views::Painter::PaintFocusPainter(this, canvas, focus_painter()); +} + void AppListButton::GetAccessibleState(ui::AXViewState* state) { state->role = ui::AX_ROLE_BUTTON; state->name = host_->GetAccessibleName(this); |