diff options
| author | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 00:25:25 +0000 |
|---|---|---|
| committer | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 00:25:25 +0000 |
| commit | e210c08d24f9ab65cac1f97127af1fbf6d8574f8 (patch) | |
| tree | ff0f03f271e4464c76ef1e6d8fdf4384cf4574ba /ppapi/examples | |
| parent | 75ff033a6dd3d94d76cc2942632e2e306fe9e146 (diff) | |
| download | chromium_src-e210c08d24f9ab65cac1f97127af1fbf6d8574f8.zip chromium_src-e210c08d24f9ab65cac1f97127af1fbf6d8574f8.tar.gz chromium_src-e210c08d24f9ab65cac1f97127af1fbf6d8574f8.tar.bz2 | |
Mouse lock example shouldn't allow any escape via mouse gesture.
Full screen button also moved up for ease of use.
BUG=41781
TEST=Manual test in ppapi/examples/mouse_lock.
Review URL: http://codereview.chromium.org/8169006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/examples')
| -rw-r--r-- | ppapi/examples/mouse_lock/mouse_lock.cc | 14 | ||||
| -rw-r--r-- | ppapi/examples/mouse_lock/mouse_lock.html | 18 |
2 files changed, 18 insertions, 14 deletions
diff --git a/ppapi/examples/mouse_lock/mouse_lock.cc b/ppapi/examples/mouse_lock/mouse_lock.cc index 0b86a4b..734aec7 100644 --- a/ppapi/examples/mouse_lock/mouse_lock.cc +++ b/ppapi/examples/mouse_lock/mouse_lock.cc @@ -53,10 +53,6 @@ class MyInstance : public pp::Instance, public pp::MouseLock_Dev { !mouse_locked_) { LockMouse( callback_factory_.NewRequiredCallback(&MyInstance::DidLockMouse)); - } else if ( - mouse_event.GetButton() == PP_INPUTEVENT_MOUSEBUTTON_MIDDLE && - mouse_locked_) { - UnlockMouse(); } return true; } @@ -72,9 +68,13 @@ class MyInstance : public pp::Instance, public pp::MouseLock_Dev { case PP_INPUTEVENT_TYPE_KEYDOWN: { pp::KeyboardInputEvent key_event(event); // Lock the mouse when the Enter key is pressed. - if (!mouse_locked_ && key_event.GetKeyCode() == 13) { - LockMouse( - callback_factory_.NewRequiredCallback(&MyInstance::DidLockMouse)); + if (key_event.GetKeyCode() == 13) { + if (mouse_locked_) { + UnlockMouse(); + } else { + LockMouse(callback_factory_.NewRequiredCallback( + &MyInstance::DidLockMouse)); + } } return true; } diff --git a/ppapi/examples/mouse_lock/mouse_lock.html b/ppapi/examples/mouse_lock/mouse_lock.html index 39bd4e2..93ff070 100644 --- a/ppapi/examples/mouse_lock/mouse_lock.html +++ b/ppapi/examples/mouse_lock/mouse_lock.html @@ -49,25 +49,29 @@ dismissed properly by this second approach.)</li> </ul> </li> - <li>Unlock mouse: + <li>Unlock mouse voluntarily: + <ul> + <li>press Enter.</li> + </ul> + </li> + <li>Unlock mouse involuntarily: <ul> <li>lose focus; or</li> <li>press Esc key; or</li> - <li>middle click; or</li> <li>exit from the "tab fullscreen" mode.</li> </ul> </li> </ul> - <object id="plugin" type="application/x-ppapi-example-mouse-lock" - width="300" height="300" border="2px"></object> - <div></div> - <object id="plugin" type="application/x-ppapi-example-mouse-lock" - width="300" height="300" border="2px"></object> <div> <button id="toggle_fullscreen" onclick="ToggleFullscreen();"> Toggle Tab Fullscreen </button> </div> + <object id="plugin" type="application/x-ppapi-example-mouse-lock" + width="300" height="300" border="2px"></object> + <div></div> + <object id="plugin" type="application/x-ppapi-example-mouse-lock" + width="300" height="300" border="2px"></object> </div> </body> </html> |