diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-25 07:07:17 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-25 07:07:17 +0000 |
| commit | 918877ca124abccf7ae498c2cb01cec9b18874be (patch) | |
| tree | b36943639d9866c58cc3044d67249f0625c3b523 /ash/display | |
| parent | a44d51fd6703c2a27175ef076eff914b7b27a43b (diff) | |
| download | chromium_src-918877ca124abccf7ae498c2cb01cec9b18874be.zip chromium_src-918877ca124abccf7ae498c2cb01cec9b18874be.tar.gz chromium_src-918877ca124abccf7ae498c2cb01cec9b18874be.tar.bz2 | |
Don't warp mouse if the cursor is locked, for now.
We probably want to change this for window dragging and/or drag&drop.
BUG=123160
TEST=manual
Review URL: https://chromiumcodereview.appspot.com/10826005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148300 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
| -rw-r--r-- | ash/display/mouse_cursor_event_filter.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ash/display/mouse_cursor_event_filter.cc b/ash/display/mouse_cursor_event_filter.cc index 0ab6f1c..781742a 100644 --- a/ash/display/mouse_cursor_event_filter.cc +++ b/ash/display/mouse_cursor_event_filter.cc @@ -5,6 +5,8 @@ #include "ash/display/mouse_cursor_event_filter.h" #include "ash/display/display_controller.h" +#include "ui/aura/cursor_manager.h" +#include "ui/aura/env.h" #include "ui/aura/event.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" @@ -28,7 +30,8 @@ bool MouseCursorEventFilter::PreHandleKeyEvent(aura::Window* target, bool MouseCursorEventFilter::PreHandleMouseEvent(aura::Window* target, aura::MouseEvent* event) { - if (event->type() != ui::ET_MOUSE_MOVED) + if (event->type() != ui::ET_MOUSE_MOVED || + aura::Env::GetInstance()->cursor_manager()->is_cursor_locked()) return false; aura::RootWindow* current_root = target->GetRootWindow(); gfx::Point location_in_root(event->location()); |