Commit 8072483e authored by kgr@chromium.org's avatar kgr@chromium.org

Added hover feedback on touch to launcher buttons.

BUG=131186
TEST=


Review URL: https://chromiumcodereview.appspot.com/10702102

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148408 0039d316-1c4b-4281-b951-d872f2087c98
parent 50caa012
...@@ -9,9 +9,12 @@ ...@@ -9,9 +9,12 @@
#include "ash/launcher/launcher_button_host.h" #include "ash/launcher/launcher_button_host.h"
#include "grit/ui_resources.h" #include "grit/ui_resources.h"
#include "skia/ext/image_operations.h"
#include "ui/aura/event.h"
#include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/accessibility/accessible_view_state.h"
#include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/animation_delegate.h"
#include "ui/base/animation/throb_animation.h" #include "ui/base/animation/throb_animation.h"
#include "ui/base/events.h"
#include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_bundle.h"
#include "ui/compositor/layer.h" #include "ui/compositor/layer.h"
#include "ui/compositor/layer_animation_element.h" #include "ui/compositor/layer_animation_element.h"
...@@ -366,6 +369,12 @@ void LauncherButton::OnMouseExited(const views::MouseEvent& event) { ...@@ -366,6 +369,12 @@ void LauncherButton::OnMouseExited(const views::MouseEvent& event) {
ui::GestureStatus LauncherButton::OnGestureEvent( ui::GestureStatus LauncherButton::OnGestureEvent(
const views::GestureEvent& event) { const views::GestureEvent& event) {
switch (event.type()) { switch (event.type()) {
case ui::ET_GESTURE_TAP_DOWN:
AddState(STATE_HOVERED);
return CustomButton::OnGestureEvent(event);
case ui::ET_GESTURE_END:
ClearState(STATE_HOVERED);
return CustomButton::OnGestureEvent(event);
case ui::ET_GESTURE_SCROLL_BEGIN: case ui::ET_GESTURE_SCROLL_BEGIN:
host_->PointerPressedOnButton(this, LauncherButtonHost::TOUCH, event); host_->PointerPressedOnButton(this, LauncherButtonHost::TOUCH, event);
return ui::GESTURE_STATUS_CONSUMED; return ui::GESTURE_STATUS_CONSUMED;
......
...@@ -89,8 +89,8 @@ class LauncherButton : public views::CustomButton { ...@@ -89,8 +89,8 @@ class LauncherButton : public views::CustomButton {
virtual void OnMouseMoved(const views::MouseEvent& event) OVERRIDE; virtual void OnMouseMoved(const views::MouseEvent& event) OVERRIDE;
virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE; virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE; virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
virtual ui::GestureStatus OnGestureEvent( virtual ui::GestureStatus OnGestureEvent(const views::GestureEvent& event)
const views::GestureEvent& event) OVERRIDE; OVERRIDE;
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
virtual void Layout() OVERRIDE; virtual void Layout() OVERRIDE;
virtual void OnFocus() OVERRIDE; virtual void OnFocus() OVERRIDE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment