Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply AutoProps to TextBox settings in SUI #14178

Merged
4 commits merged into from
Nov 4, 2022
Merged

Apply AutoProps to TextBox settings in SUI #14178

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b57cd3
Apply AutoProps to TextBox settings in SUI
carlos-zamora Oct 10, 2022
99ceaf5
apply feedback; don't apply AP to panels
carlos-zamora Oct 12, 2022
d5ddf47
Merge branch 'main' into dev/cazamor/a11y/sui-textbox-ap
carlos-zamora Nov 4, 2022
f3d4781
fix bad merge
carlos-zamora Nov 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions src/cascadia/TerminalSettingsEditor/SettingContainer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,43 +133,46 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
_UpdateOverrideSystem();

// Get the correct base to apply automation properties to
DependencyObject base{ nullptr };
std::vector<DependencyObject> base;
base.reserve(2);
lhecker marked this conversation as resolved.
Show resolved Hide resolved
if (const auto& child{ GetTemplateChild(L"Expander") })
{
if (const auto& expander{ child.try_as<Microsoft::UI::Xaml::Controls::Expander>() })
{
base = child;
base.push_back(child);
}
}
else if (const auto& content{ Content() })
if (const auto& content{ Content() })
{
if (const auto& obj{ content.try_as<DependencyObject>() })
const auto& panel{ content.try_as<Controls::Panel>() };
const auto& obj{ content.try_as<DependencyObject>() };
if (!panel && obj)
{
base = obj;
base.push_back(obj);
}
}

if (base)
for (const auto& obj : base)
{
// apply header as name (automation property)
if (const auto& header{ Header() })
{
if (const auto headerText{ header.try_as<hstring>() })
{
Automation::AutomationProperties::SetName(base, *headerText);
Automation::AutomationProperties::SetName(obj, *headerText);
}
}

// apply help text as tooltip and full description (automation property)
if (const auto& helpText{ HelpText() }; !helpText.empty())
{
Controls::ToolTipService::SetToolTip(base, box_value(helpText));
Automation::AutomationProperties::SetFullDescription(base, helpText);
Controls::ToolTipService::SetToolTip(obj, box_value(helpText));
Automation::AutomationProperties::SetFullDescription(obj, helpText);
}
else
{
Controls::ToolTipService::SetToolTip(base, nullptr);
Automation::AutomationProperties::SetFullDescription(base, L"");
Controls::ToolTipService::SetToolTip(obj, nullptr);
Automation::AutomationProperties::SetFullDescription(obj, L"");
}
}

Expand Down