mirror of
https://github.com/microsoft/terminal.git
synced 2025-12-10 00:48:23 -06:00
Merge branch 'dev/pabhoj/settings_model_reflection' into dev/pabhoj/settings_actions_editor
This commit is contained in:
commit
ef197d2153
@ -636,17 +636,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
|
||||
h.write(ContentArgs());
|
||||
return h.finalize();
|
||||
}
|
||||
uint32_t GetArgCount()
|
||||
{
|
||||
if (_ContentArgs)
|
||||
{
|
||||
if (const auto newTermArgs = _ContentArgs.try_as<NewTerminalArgs>())
|
||||
{
|
||||
return newTermArgs->GetArgCount();
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
winrt::Windows::Foundation::Collections::IVectorView<ArgDescriptor> GetArgDescriptors()
|
||||
{
|
||||
if (_ContentArgs)
|
||||
@ -766,10 +755,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
|
||||
h.write(SplitSize());
|
||||
return h.finalize();
|
||||
}
|
||||
uint32_t GetArgCount()
|
||||
{
|
||||
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);
|
||||
@ -874,17 +859,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
|
||||
h.write(ContentArgs());
|
||||
return h.finalize();
|
||||
}
|
||||
uint32_t GetArgCount()
|
||||
{
|
||||
if (_ContentArgs)
|
||||
{
|
||||
if (const auto newTermArgs = _ContentArgs.try_as<NewTerminalArgs>())
|
||||
{
|
||||
return newTermArgs->GetArgCount();
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
winrt::Windows::Foundation::Collections::IVectorView<Model::ArgDescriptor> GetArgDescriptors()
|
||||
{
|
||||
return _ContentArgs.as<NewTerminalArgs>()->GetArgDescriptors();
|
||||
@ -1037,10 +1011,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
|
||||
h.write(winrt::get_abi(_Actions));
|
||||
return h.finalize();
|
||||
}
|
||||
uint32_t GetArgCount()
|
||||
{
|
||||
return _Actions.Size();
|
||||
}
|
||||
winrt::Windows::Foundation::Collections::IVectorView<Model::ArgDescriptor> GetArgDescriptors()
|
||||
{
|
||||
return {};
|
||||
|
||||
@ -23,7 +23,6 @@ namespace Microsoft.Terminal.Settings.Model
|
||||
|
||||
interface IActionArgsDescriptorAccess
|
||||
{
|
||||
UInt32 GetArgCount();
|
||||
Windows.Foundation.Collections.IVectorView<ArgDescriptor> GetArgDescriptors();
|
||||
IInspectable GetArgAt(UInt32 index);
|
||||
void SetArgAt(UInt32 index, Object value);
|
||||
|
||||
@ -217,10 +217,6 @@ public:
|
||||
argsMacro(HASH_ARGS); \
|
||||
return h.finalize(); \
|
||||
} \
|
||||
uint32_t GetArgCount() \
|
||||
{ \
|
||||
return gsl::narrow<uint32_t>(GetArgDescriptors().Size()); \
|
||||
} \
|
||||
winrt::Windows::Foundation::Collections::IVectorView<ArgDescriptor> GetArgDescriptors() \
|
||||
{ \
|
||||
static const auto descriptors = INIT_ARG_DESCRIPTORS(argsMacro); \
|
||||
@ -249,10 +245,6 @@ private:
|
||||
InitListPlaceholder _placeholder; \
|
||||
\
|
||||
public: \
|
||||
uint32_t GetArgCount() \
|
||||
{ \
|
||||
return gsl::narrow<uint32_t>(GetArgDescriptors().Size()); \
|
||||
} \
|
||||
winrt::Windows::Foundation::Collections::IVectorView<ArgDescriptor> GetArgDescriptors() \
|
||||
{ \
|
||||
static const auto descriptors = INIT_ARG_DESCRIPTORS(argsMacro); \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user