diff --git a/src/cascadia/TerminalApp/Command.cpp b/src/cascadia/TerminalApp/Command.cpp index 515e413a9d..d4d69f5f20 100644 --- a/src/cascadia/TerminalApp/Command.cpp +++ b/src/cascadia/TerminalApp/Command.cpp @@ -30,11 +30,11 @@ namespace winrt::TerminalApp::implementation { Command::Command() { - _nestedCommandsView = winrt::single_threaded_observable_vector(); + _nestedCommandsView = winrt::single_threaded_vector(); _setAction(nullptr); } - Collections::IObservableVector Command::NestedCommands() + Collections::IVector Command::NestedCommands() { return _nestedCommandsView; } diff --git a/src/cascadia/TerminalApp/Command.h b/src/cascadia/TerminalApp/Command.h index 9f026a1fba..8c7420ff76 100644 --- a/src/cascadia/TerminalApp/Command.h +++ b/src/cascadia/TerminalApp/Command.h @@ -52,7 +52,7 @@ namespace winrt::TerminalApp::implementation static std::vector<::TerminalApp::SettingsLoadWarnings> LayerJson(std::unordered_map& commands, const Json::Value& json); - Windows::Foundation::Collections::IObservableVector NestedCommands(); + Windows::Foundation::Collections::IVector NestedCommands(); WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler); OBSERVABLE_GETSET_PROPERTY(winrt::hstring, Name, _PropertyChangedHandlers); @@ -63,7 +63,7 @@ namespace winrt::TerminalApp::implementation private: Json::Value _originalJson; std::unordered_map _subcommands; - Windows::Foundation::Collections::IObservableVector _nestedCommandsView{ nullptr }; + Windows::Foundation::Collections::IVector _nestedCommandsView{ nullptr }; static std::vector _expandCommand(winrt::com_ptr expandable, const std::vector<::TerminalApp::Profile>& profiles, diff --git a/src/cascadia/TerminalApp/Command.idl b/src/cascadia/TerminalApp/Command.idl index 3dba75026a..ea550b2137 100644 --- a/src/cascadia/TerminalApp/Command.idl +++ b/src/cascadia/TerminalApp/Command.idl @@ -13,6 +13,6 @@ namespace TerminalApp ActionAndArgs Action; String KeyChordText; - Windows.Foundation.Collections.IObservableVector NestedCommands { get; }; + Windows.Foundation.Collections.IVector NestedCommands { get; }; } } diff --git a/src/cascadia/TerminalApp/defaults.json b/src/cascadia/TerminalApp/defaults.json index 4f3dcc872c..af61cfe9ff 100644 --- a/src/cascadia/TerminalApp/defaults.json +++ b/src/cascadia/TerminalApp/defaults.json @@ -341,38 +341,6 @@ { "command": { "action": "adjustFontSize", "delta": 1 }, "keys": "ctrl+=" }, { "command": { "action": "adjustFontSize", "delta": -1 }, "keys": "ctrl+-" }, { "command": "resetFontSize", "keys": "ctrl+0" } - ], - - "commands": [ - { "icon": null, "name": { "key": "NewTabCommandKey" }, "action": "newTab" }, - { "icon": null, "name": { "key": "DuplicateTabCommandKey" }, "action": "duplicateTab" }, - { "icon": null, "name": { "key": "DuplicatePaneCommandKey" }, "action": { "action": "splitPane", "split":"auto", "splitMode": "duplicate" } }, - { "icon": null, "name": { "key": "SplitHorizontalCommandKey" }, "action": { "action": "splitPane", "split": "horizontal" } }, - { "icon": null, "name": { "key": "SplitVerticalCommandKey" }, "action": { "action": "splitPane", "split": "vertical" } }, - - { "icon": null, "name": { "key": "CloseWindowCommandKey" }, "action": "closeWindow" }, - { "icon": null, "name": { "key": "ClosePaneCommandKey" }, "action": "closePane" }, - - { "icon": null, "name": { "key": "OpenNewTabDropdownCommandKey" }, "action": "openNewTabDropdown" }, - { "icon": null, "name": { "key": "OpenSettingsCommandKey" }, "action": "openSettings" }, - - { "icon": null, "name": { "key": "FindCommandKey" }, "action": "find" }, - - { "icon": null, "name": { "key": "NextTabCommandKey" }, "action": "nextTab" }, - { "icon": null, "name": { "key": "PrevTabCommandKey" }, "action": "prevTab" }, - - { "icon": null, "name": { "key": "ToggleFullscreenCommandKey" }, "action": "toggleFullscreen" }, - - { "icon": null, "name": { "key": "CopyTextCommandKey" }, "action": { "action": "copy", "singleLine": false } }, - { "icon": null, "name": { "key": "PasteCommandKey" }, "action": "paste" }, - - { "icon": null, "name": { "key": "IncreaseFontSizeCommandKey" }, "action": { "action": "adjustFontSize", "delta": 1 } }, - { "icon": null, "name": { "key": "DecreaseFontSizeCommandKey" }, "action": { "action": "adjustFontSize", "delta": -1 } }, - { "icon": null, "name": { "key": "ResetFontSizeCommandKey" }, "action": "resetFontSize" }, - - { "icon": null, "name": { "key": "ScrollDownCommandKey" }, "action": "scrollDown" }, - { "icon": null, "name": { "key": "ScrollDownPageCommandKey" }, "action": "scrollDownPage" }, - { "icon": null, "name": { "key": "ScrollUpCommandKey" }, "action": "scrollUp" }, - { "icon": null, "name": { "key": "ScrollUpPageCommandKey" }, "action": "scrollUpPage" } ] + }