From 128d86d3def19d7d8baccbc0b35b56bbb0442bac Mon Sep 17 00:00:00 2001 From: Carlos Zamora Date: Wed, 16 Sep 2020 17:38:09 -0700 Subject: [PATCH] simplify PR --- src/cascadia/TerminalApp/ActionAndArgs.cpp | 6 +++--- src/cascadia/TerminalApp/defaults.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cascadia/TerminalApp/ActionAndArgs.cpp b/src/cascadia/TerminalApp/ActionAndArgs.cpp index c91956c976e..bfab15668ed 100644 --- a/src/cascadia/TerminalApp/ActionAndArgs.cpp +++ b/src/cascadia/TerminalApp/ActionAndArgs.cpp @@ -22,7 +22,7 @@ static constexpr std::string_view NewTabKey{ "newTab" }; static constexpr std::string_view NewWindowKey{ "newWindow" }; static constexpr std::string_view NextTabKey{ "nextTab" }; static constexpr std::string_view OpenNewTabDropdownKey{ "openNewTabDropdown" }; -static constexpr std::string_view OpenSettingsKey{ "openSettings" }; +static constexpr std::string_view OpenSettingsKey{ "openSettings" }; // TODO GH#2557: Add args for OpenSettings static constexpr std::string_view OpenTabColorPickerKey{ "openTabColorPicker" }; static constexpr std::string_view PasteTextKey{ "paste" }; static constexpr std::string_view PrevTabKey{ "prevTab" }; @@ -43,7 +43,7 @@ static constexpr std::string_view ToggleAlwaysOnTopKey{ "toggleAlwaysOnTop" }; static constexpr std::string_view ToggleCommandPaletteKey{ "commandPalette" }; static constexpr std::string_view ToggleFocusModeKey{ "toggleFocusMode" }; static constexpr std::string_view ToggleFullscreenKey{ "toggleFullscreen" }; -//static constexpr std::string_view TogglePaneZoomKey{ "togglePaneZoom" }; // TODO GH#7252: Re-enable pane zooming +static constexpr std::string_view TogglePaneZoomKey{ "togglePaneZoom" }; static constexpr std::string_view ToggleRetroEffectKey{ "toggleRetroEffect" }; static constexpr std::string_view ActionKey{ "action" }; @@ -283,7 +283,7 @@ namespace winrt::TerminalApp::implementation { ShortcutAction::ToggleCommandPalette, RS_(L"ToggleCommandPaletteCommandKey") }, { ShortcutAction::ToggleFocusMode, RS_(L"ToggleFocusModeCommandKey") }, { ShortcutAction::ToggleFullscreen, RS_(L"ToggleFullscreenCommandKey") }, - // { ShortcutAction::TogglePaneZoom, RS_(L"TogglePaneZoomCommandKey") }, // TODO GH#7252: Re-enable pane zooming + { ShortcutAction::TogglePaneZoom, RS_(L"TogglePaneZoomCommandKey") }, { ShortcutAction::ToggleRetroEffect, RS_(L"ToggleRetroEffectCommandKey") }, }; }(); diff --git a/src/cascadia/TerminalApp/defaults.json b/src/cascadia/TerminalApp/defaults.json index d8d636b3e2e..61def1e2610 100644 --- a/src/cascadia/TerminalApp/defaults.json +++ b/src/cascadia/TerminalApp/defaults.json @@ -327,7 +327,7 @@ { "command": { "action": "moveFocus", "direction": "down" }, "keys": "alt+down" }, { "command": { "action": "moveFocus", "direction": "left" }, "keys": "alt+left" }, { "command": { "action": "moveFocus", "direction": "right" }, "keys": "alt+right" }, - { "command": { "action": "moveFocus", "direction": "up" }, "keys": "alt+up" } + { "command": { "action": "moveFocus", "direction": "up" }, "keys": "alt+up" }, // Clipboard Integration { "command": { "action": "copy", "singleLine": false }, "keys": "ctrl+shift+c" },