From 48fa9730d36a831e0f0d950328959d6e20dc1a83 Mon Sep 17 00:00:00 2001
From: thestig <thestig@chromium.org>
Date: Fri, 26 Sep 2014 14:15:50 -0700
Subject: PDF: Change the rotate shortcut keys to ctrl+[] on all platforms.
The default modifier key on Mac is Command, but that conflicts with
the forward and backward keys.
BUG=111232,417902
Review URL: https://codereview.chromium.org/606933002
Cr-Commit-Position: refs/heads/master@{#297033}
---
pdf/instance.cc | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
(limited to 'pdf/instance.cc')
diff --git a/pdf/instance.cc b/pdf/instance.cc
index 6a68400..a71d071 100644
--- a/pdf/instance.cc
+++ b/pdf/instance.cc
@@ -587,21 +587,26 @@ bool Instance::HandleInputEvent(const pp::InputEvent& event) {
}
}
- if (event.GetType() == PP_INPUTEVENT_TYPE_KEYDOWN &&
- event.GetModifiers() & kDefaultKeyModifier) {
+ if (event.GetType() == PP_INPUTEVENT_TYPE_KEYDOWN) {
pp::KeyboardInputEvent keyboard_event(event);
- switch (keyboard_event.GetKeyCode()) {
- case 'A':
- engine_->SelectAll();
- return true;
- case ui::VKEY_OEM_4:
- // Left bracket.
- engine_->RotateCounterclockwise();
- return true;
- case ui::VKEY_OEM_6:
- // Right bracket.
- engine_->RotateClockwise();
- return true;
+ const uint32 modifier = event.GetModifiers();
+ if (modifier & kDefaultKeyModifier) {
+ switch (keyboard_event.GetKeyCode()) {
+ case 'A':
+ engine_->SelectAll();
+ return true;
+ }
+ } else if (modifier & PP_INPUTEVENT_MODIFIER_CONTROLKEY) {
+ switch (keyboard_event.GetKeyCode()) {
+ case ui::VKEY_OEM_4:
+ // Left bracket.
+ engine_->RotateCounterclockwise();
+ return true;
+ case ui::VKEY_OEM_6:
+ // Right bracket.
+ engine_->RotateClockwise();
+ return true;
+ }
}
}
--
cgit v1.1