Skip to content

GitLab

T
tangled
Commit bce2ad50 authored by Elly Fong-Jones's avatar Elly Fong-Jones Committed by Commit Bot
Browse files
Options

mac: change focus pane bindings 

The original version of this used Cmd-Option-Up and
Cmd-Option-Shift-Up; after some experimentation and further thought
from UX we're going to go to Cmd-Option-Up and Cmd-Option-Down
instead, which will free up Cmd-Option-Shift-{Up,Down} for another use.

Bug: 956432
Change-Id: Id617bef7f94fcc35d438bf585a675a28a667bc06
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1868914
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707795}
parent a8e15172
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
chrome/browser/global_keyboard_shortcuts_mac.mm
View file @ bce2ad50
...@@ -136,8 +136,8 @@ CommandForKeyEventResult ShortcutCommand(int cmd) { ...@@ -136,8 +136,8 @@ CommandForKeyEventResult ShortcutCommand(int cmd) {
const std::vector<KeyboardShortcutData>& GetShortcutsNotPresentInMainMenu() { const std::vector<KeyboardShortcutData>& GetShortcutsNotPresentInMainMenu() {
// clang-format off // clang-format off
static base::NoDestructor<std::vector<KeyboardShortcutData>> keys({ static base::NoDestructor<std::vector<KeyboardShortcutData>> keys({
//cmd shift cntrl option vkeycode command // cmd shift cntrl option vkeycode command
//--- ----- ----- ------ -------- ------- // --- ----- ----- ------ -------- -------
{true, true, false, false, kVK_ANSI_RightBracket, IDC_SELECT_NEXT_TAB}, {true, true, false, false, kVK_ANSI_RightBracket, IDC_SELECT_NEXT_TAB},
{true, true, false, false, kVK_ANSI_LeftBracket, IDC_SELECT_PREVIOUS_TAB}, {true, true, false, false, kVK_ANSI_LeftBracket, IDC_SELECT_PREVIOUS_TAB},
{false, false, true, false, kVK_PageDown, IDC_SELECT_NEXT_TAB}, {false, false, true, false, kVK_PageDown, IDC_SELECT_NEXT_TAB},
...@@ -146,31 +146,31 @@ const std::vector<KeyboardShortcutData>& GetShortcutsNotPresentInMainMenu() { ...@@ -146,31 +146,31 @@ const std::vector<KeyboardShortcutData>& GetShortcutsNotPresentInMainMenu() {
{true, false, false, true, kVK_LeftArrow, IDC_SELECT_PREVIOUS_TAB}, {true, false, false, true, kVK_LeftArrow, IDC_SELECT_PREVIOUS_TAB},
// Cmd-0..8 select the nth tab, with cmd-9 being "last tab". // Cmd-0..8 select the nth tab, with cmd-9 being "last tab".
{true, false, false, false, kVK_ANSI_1, IDC_SELECT_TAB_0}, {true, false, false, false, kVK_ANSI_1, IDC_SELECT_TAB_0},
{true, false, false, false, kVK_ANSI_Keypad1, IDC_SELECT_TAB_0}, {true, false, false, false, kVK_ANSI_Keypad1, IDC_SELECT_TAB_0},
{true, false, false, false, kVK_ANSI_2, IDC_SELECT_TAB_1}, {true, false, false, false, kVK_ANSI_2, IDC_SELECT_TAB_1},
{true, false, false, false, kVK_ANSI_Keypad2, IDC_SELECT_TAB_1}, {true, false, false, false, kVK_ANSI_Keypad2, IDC_SELECT_TAB_1},
{true, false, false, false, kVK_ANSI_3, IDC_SELECT_TAB_2}, {true, false, false, false, kVK_ANSI_3, IDC_SELECT_TAB_2},
{true, false, false, false, kVK_ANSI_Keypad3, IDC_SELECT_TAB_2}, {true, false, false, false, kVK_ANSI_Keypad3, IDC_SELECT_TAB_2},
{true, false, false, false, kVK_ANSI_4, IDC_SELECT_TAB_3}, {true, false, false, false, kVK_ANSI_4, IDC_SELECT_TAB_3},
{true, false, false, false, kVK_ANSI_Keypad4, IDC_SELECT_TAB_3}, {true, false, false, false, kVK_ANSI_Keypad4, IDC_SELECT_TAB_3},
{true, false, false, false, kVK_ANSI_5, IDC_SELECT_TAB_4}, {true, false, false, false, kVK_ANSI_5, IDC_SELECT_TAB_4},
{true, false, false, false, kVK_ANSI_Keypad5, IDC_SELECT_TAB_4}, {true, false, false, false, kVK_ANSI_Keypad5, IDC_SELECT_TAB_4},
{true, false, false, false, kVK_ANSI_6, IDC_SELECT_TAB_5}, {true, false, false, false, kVK_ANSI_6, IDC_SELECT_TAB_5},
{true, false, false, false, kVK_ANSI_Keypad6, IDC_SELECT_TAB_5}, {true, false, false, false, kVK_ANSI_Keypad6, IDC_SELECT_TAB_5},
{true, false, false, false, kVK_ANSI_7, IDC_SELECT_TAB_6}, {true, false, false, false, kVK_ANSI_7, IDC_SELECT_TAB_6},
{true, false, false, false, kVK_ANSI_Keypad7, IDC_SELECT_TAB_6}, {true, false, false, false, kVK_ANSI_Keypad7, IDC_SELECT_TAB_6},
{true, false, false, false, kVK_ANSI_8, IDC_SELECT_TAB_7}, {true, false, false, false, kVK_ANSI_8, IDC_SELECT_TAB_7},
{true, false, false, false, kVK_ANSI_Keypad8, IDC_SELECT_TAB_7}, {true, false, false, false, kVK_ANSI_Keypad8, IDC_SELECT_TAB_7},
{true, false, false, false, kVK_ANSI_9, IDC_SELECT_LAST_TAB}, {true, false, false, false, kVK_ANSI_9, IDC_SELECT_LAST_TAB},
{true, false, false, false, kVK_ANSI_Keypad9, IDC_SELECT_LAST_TAB}, {true, false, false, false, kVK_ANSI_Keypad9, IDC_SELECT_LAST_TAB},
{true, true, false, false, kVK_ANSI_M, IDC_SHOW_AVATAR_MENU}, {true, true, false, false, kVK_ANSI_M, IDC_SHOW_AVATAR_MENU},
{true, false, false, true, kVK_ANSI_L, IDC_SHOW_DOWNLOADS}, {true, false, false, true, kVK_ANSI_L, IDC_SHOW_DOWNLOADS},
{true, true, false, false, kVK_ANSI_C, IDC_DEV_TOOLS_INSPECT}, {true, true, false, false, kVK_ANSI_C, IDC_DEV_TOOLS_INSPECT},
{true, false, false, true, kVK_ANSI_C, IDC_DEV_TOOLS_INSPECT}, {true, false, false, true, kVK_ANSI_C, IDC_DEV_TOOLS_INSPECT},
{true, false, false, true, kVK_UpArrow, IDC_FOCUS_NEXT_PANE}, {true, false, false, true, kVK_DownArrow, IDC_FOCUS_NEXT_PANE},
{true, true, false, true, kVK_UpArrow, IDC_FOCUS_PREVIOUS_PANE}, {true, false, false, true, kVK_UpArrow, IDC_FOCUS_PREVIOUS_PANE},
}); });
// clang-format on // clang-format on
return *keys; return *keys;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment