microsoft/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2025-12-10 00:48:23 -06:00
Code Issues Packages Projects Releases 138 Wiki Activity

two cached vectors

Browse Source
This commit is contained in:
Pankaj Bhojwani 2025-08-18 16:29:14 -07:00
parent 981a01e74d
commit 892ced6179
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/cascadia/TerminalSettingsModel/ActionArgs.h
View File

@ -757,29 +757,35 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
}
winrt::Windows::Foundation::Collections::IVectorView<Model::ArgDescriptor> GetArgDescriptors()
{
static const auto thisArgs = INIT_ARG_DESCRIPTORS(SPLIT_PANE_ARGS);
// Base args for SplitPane
static const auto baseArgs = INIT_ARG_DESCRIPTORS(SPLIT_PANE_ARGS);
// Merge into a new vector
std::vector<Model::ArgDescriptor> merged;
// Cached merged variant: SplitPane + NewTerminalArgs
static const auto mergedArgs = [] {
std::vector<Model::ArgDescriptor> temp;
for (const auto desc : thisArgs)
{
merged.push_back(desc);
}
if (_ContentArgs)
{
if (const auto newTermArgs = _ContentArgs.try_as<NewTerminalArgs>())
// copy baseArgs
for (const auto& desc : baseArgs)
{
auto contentArgs = newTermArgs->GetArgDescriptors();
for (const auto desc : contentArgs)
{
merged.push_back(desc);
}
temp.push_back(desc);
}
}
return winrt::single_threaded_vector(std::move(merged)).GetView();
// append NewTerminalArgs args
const auto newTerminalArgsDesc{ Model::NewTerminalArgs{}.GetArgDescriptors() };
for (const auto& desc : newTerminalArgsDesc)
{
temp.push_back(desc);
}
return winrt::single_threaded_vector(std::move(temp)).GetView();
}();
// Pick which cached vector to return
if (_ContentArgs && _ContentArgs.try_as<NewTerminalArgs>())
{
return mergedArgs;
}
return baseArgs;
}
IInspectable GetArgAt(uint32_t index)
{