diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 18:10:23 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 18:10:23 +0000 |
| commit | 9cc041769c7e4fe6102c3acc21e1bc11e632e833 (patch) | |
| tree | 770c02e7431669f205af508c6030e325333c1c70 /ash/magnifier | |
| parent | 3f74873b594731f8e9430da84fbc51b3a8436510 (diff) | |
| download | chromium_src-9cc041769c7e4fe6102c3acc21e1bc11e632e833.zip chromium_src-9cc041769c7e4fe6102c3acc21e1bc11e632e833.tar.gz chromium_src-9cc041769c7e4fe6102c3acc21e1bc11e632e833.tar.bz2 | |
events: Move all the scroll-event handling in the OnScrollEvent overrides.
BUG=159632
Review URL: https://codereview.chromium.org/11365272
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/magnifier')
| -rw-r--r-- | ash/magnifier/magnification_controller.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index d9c7db9..63b0307 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc @@ -456,21 +456,6 @@ ui::EventResult MagnificationControllerImpl::OnKeyEvent(ui::KeyEvent* event) { ui::EventResult MagnificationControllerImpl::OnMouseEvent( ui::MouseEvent* event) { - if (event->IsAltDown() && event->IsControlDown()) { - if (event->type() == ui::ET_SCROLL_FLING_START || - event->type() == ui::ET_SCROLL_FLING_CANCEL) { - return ui::ER_CONSUMED; - } - - if (event->type() == ui::ET_SCROLL) { - ui::ScrollEvent* scroll_event = static_cast<ui::ScrollEvent*>(event); - float scale = GetScale(); - scale += scroll_event->y_offset() * kScrollScaleChangeFactor; - SetScale(scale, true); - return ui::ER_CONSUMED; - } - } - if (IsMagnified() && event->type() == ui::ET_MOUSE_MOVED) { aura::Window* target = static_cast<aura::Window*>(event->target()); aura::RootWindow* current_root = target->GetRootWindow(); @@ -489,6 +474,21 @@ ui::EventResult MagnificationControllerImpl::OnMouseEvent( ui::EventResult MagnificationControllerImpl::OnScrollEvent( ui::ScrollEvent* event) { + if (event->IsAltDown() && event->IsControlDown()) { + if (event->type() == ui::ET_SCROLL_FLING_START || + event->type() == ui::ET_SCROLL_FLING_CANCEL) { + return ui::ER_CONSUMED; + } + + if (event->type() == ui::ET_SCROLL) { + ui::ScrollEvent* scroll_event = static_cast<ui::ScrollEvent*>(event); + float scale = GetScale(); + scale += scroll_event->y_offset() * kScrollScaleChangeFactor; + SetScale(scale, true); + return ui::ER_CONSUMED; + } + } + return ui::ER_UNHANDLED; } |