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

Merge branch 'dev/pabhoj/settings_model_reflection' into dev/pabhoj/settings_actions_editor

Browse Source
This commit is contained in:
Pankaj Bhojwani 2025-08-15 11:36:59 -07:00
commit 8a81db792f
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -768,38 +768,37 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
}
uint32_t GetArgCount()
{
if (_ContentArgs)
{
if (const auto newTermArgs = _ContentArgs.try_as<NewTerminalArgs>())
{
return newTermArgs->GetArgCount() + gsl::narrow<uint32_t>(GetArgDescriptors().Size());
}
}
return gsl::narrow<uint32_t>(GetArgDescriptors().Size());
}
winrt::Windows::Foundation::Collections::IVectorView<Model::ArgDescriptor> GetArgDescriptors()
{
static const auto thisArgs = INIT_ARG_DESCRIPTORS(SPLIT_PANE_ARGS);
auto contentArgs = _ContentArgs.as<NewTerminalArgs>()->GetArgDescriptors();
// Merge into a new vector
std::vector<Model::ArgDescriptor> merged;
merged.reserve(thisArgs.Size() + contentArgs.Size());
for (const auto desc : thisArgs)
{
merged.push_back(desc);
}
for (const auto desc : contentArgs)
if (_ContentArgs)
{
merged.push_back(desc);
if (const auto newTermArgs = _ContentArgs.try_as<NewTerminalArgs>())
{
auto contentArgs = newTermArgs->GetArgDescriptors();
for (const auto desc : contentArgs)
{
merged.push_back(desc);
}
}
}
return winrt::single_threaded_vector(std::move(merged)).GetView();
}
IInspectable GetArgAt(uint32_t index)
{
const auto additionalArgCount = gsl::narrow<uint32_t>(GetArgDescriptors().Size());
const auto additionalArgCount = INIT_ARG_DESCRIPTORS(SPLIT_PANE_ARGS).Size();
if (index < additionalArgCount)
{
X_MACRO_INDEX_BASE();
@ -813,7 +812,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
}
void SetArgAt(uint32_t index, IInspectable value)
{
const auto additionalArgCount = gsl::narrow<uint32_t>(GetArgDescriptors().Size());
const auto additionalArgCount = INIT_ARG_DESCRIPTORS(SPLIT_PANE_ARGS).Size();
if (index < additionalArgCount)
{
X_MACRO_INDEX_BASE();

4
src/cascadia/TerminalSettingsModel/ActionArgsMagic.h
View File

@ -89,10 +89,10 @@ struct InitListPlaceholder
&&(otherAsUs->_##name == _##name)
#define X_MACRO_INDEX_BASE() \
constexpr auto X_MACRO_INDEXED_BASE__ = __COUNTER__ - 1
constexpr auto X_MACRO_INDEXED_BASE__ = __COUNTER__
#define X_MACRO_INDEX() \
(__COUNTER__ - X_MACRO_INDEXED_BASE__)
(__COUNTER__ - X_MACRO_INDEXED_BASE__ - 1)
// getter and setter for each property by index
#define GET_ARG_BY_INDEX(type, name, jsonKey, required, typeHint, ...) \