diff --git a/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp b/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp index 31016e50ca4..caa38feb8d7 100644 --- a/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp +++ b/src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp @@ -158,7 +158,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation { ShortcutAction::NewWindow, NewWindowArgs::ToJson }, { ShortcutAction::PrevTab, PrevTabArgs::ToJson }, { ShortcutAction::NextTab, NextTabArgs::ToJson }, - { ShortcutAction::RenameWindow, RenameWindowArgs::ToJson } + { ShortcutAction::RenameWindow, RenameWindowArgs::ToJson }, + { ShortcutAction::GlobalSummon, GlobalSummonArgs::ToJson } }; // Function Description: diff --git a/src/cascadia/TerminalSettingsModel/ActionArgs.cpp b/src/cascadia/TerminalSettingsModel/ActionArgs.cpp index 2ae13104b6e..c778bb511d6 100644 --- a/src/cascadia/TerminalSettingsModel/ActionArgs.cpp +++ b/src/cascadia/TerminalSettingsModel/ActionArgs.cpp @@ -591,10 +591,10 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation // "Summon the Terminal window" // "Summon the Terminal window, name:\"{_Name}\"" - if (!_Name.empty()) + if (!Name().empty()) { ss << L", name: "; - ss << std::wstring_view(_Name); + ss << std::wstring_view(Name()); } return winrt::hstring{ ss.str() }; } diff --git a/src/cascadia/TerminalSettingsModel/ActionArgs.h b/src/cascadia/TerminalSettingsModel/ActionArgs.h index 8c9ef03a746..25d2781c541 100644 --- a/src/cascadia/TerminalSettingsModel/ActionArgs.h +++ b/src/cascadia/TerminalSettingsModel/ActionArgs.h @@ -1375,6 +1375,15 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation JsonUtils::GetValueForKey(json, ToggleVisibilityKey, args->_ToggleVisibility); return { *args, {} }; } + static Json::Value ToJson(const IActionArgs& val) + { + Json::Value json{ Json::ValueType::objectValue }; + const auto args{ get_self(val) }; + JsonUtils::SetValueForKey(json, NameKey, args->_Name); + JsonUtils::SetValueForKey(json, DesktopKey, args->_Desktop); + JsonUtils::SetValueForKey(json, ToggleVisibilityKey, args->_ToggleVisibility); + return json; + } IActionArgs Copy() const { auto copy{ winrt::make_self() };