diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-01 02:57:32 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-01 02:57:32 +0000 |
commit | e0dfebf8d0b7d9d902f16a92d6ab7b6f1140ca99 (patch) | |
tree | d71b7f80665b5afc8fd1d4b82db6143a61f913d8 /views/aura_desktop | |
parent | 16cd877ed6fc2b62c05eb51ba8071dc169834439 (diff) | |
download | chromium_src-e0dfebf8d0b7d9d902f16a92d6ab7b6f1140ca99.zip chromium_src-e0dfebf8d0b7d9d902f16a92d6ab7b6f1140ca99.tar.gz chromium_src-e0dfebf8d0b7d9d902f16a92d6ab7b6f1140ca99.tar.bz2 |
Wire MouseEvents through to the NativeWidgetAura.
http://crbug.com/93933
TEST=none
Review URL: http://codereview.chromium.org/7812014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99108 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/aura_desktop')
-rw-r--r-- | views/aura_desktop/aura_desktop_main.cc | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/views/aura_desktop/aura_desktop_main.cc b/views/aura_desktop/aura_desktop_main.cc index eabf9fe..219f5e5 100644 --- a/views/aura_desktop/aura_desktop_main.cc +++ b/views/aura_desktop/aura_desktop_main.cc @@ -27,9 +27,14 @@ class DemoWindowDelegate : public aura::WindowDelegate { public: explicit DemoWindowDelegate(SkColor color) : color_(color) {} + virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE { + return true; + } virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { canvas->AsCanvasSkia()->drawColor(color_, SkXfermode::kSrc_Mode); } + virtual void OnWindowDestroyed() OVERRIDE { + } private: SkColor color_; @@ -39,14 +44,32 @@ class DemoWindowDelegate : public aura::WindowDelegate { class TestView : public views::View { public: - TestView() {} + TestView() : color_shifting_(false), color_(SK_ColorYELLOW) {} virtual ~TestView() {} private: // Overridden from views::View: virtual void OnPaint(gfx::Canvas* canvas) { - canvas->FillRectInt(SK_ColorYELLOW, 0, 0, width(), height()); + canvas->FillRectInt(color_, 0, 0, width(), height()); + } + virtual bool OnMousePressed(const views::MouseEvent& event) { + color_shifting_ = true; + return true; + } + virtual void OnMouseMoved(const views::MouseEvent& event) { + if (color_shifting_) { + color_ = SkColorSetRGB((SkColorGetR(color_) + 5) % 255, + SkColorGetG(color_), + SkColorGetB(color_)); + SchedulePaint(); + } } + virtual void OnMouseReleased(const views::MouseEvent& event) { + color_shifting_ = false; + } + + bool color_shifting_; + SkColor color_; DISALLOW_COPY_AND_ASSIGN(TestView); }; |