starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-02-11 13:45:07 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

Localize and polish Profile page navigators (#12321)

Browse Source 
## Summary of the Pull Request
Adds some polish around the navigators in the profile page (i.e. "appearance" and "advanced" button) by doing the following:
- use the localized resources for the pivot on the navigators
- simplify the navigators to be buttons instead of toggle buttons

Doing so has Narrator identify these as buttons rather than toggle buttons. So now Narrator won't say that the button is "off", which just makes more sense.

## Validation Steps Performed
✅ Narrator says "Advanced button" or "Appearance button" on the navigator
✅ The navigators look the same as before
This commit is contained in:
Carlos Zamora
2022-02-01 16:19:15 -08:00
committed by GitHub
parent bf32f45616
commit d07c53671e
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cascadia/TerminalSettingsEditor/CommonResources.xaml
View File

@@ -791,8 +791,8 @@
</Setter>
</Style>
<Style x:Key="ToggleButtonStyle"
TargetType="ToggleButton">
<Style x:Key="NavigatorButtonStyle"
TargetType="Button">
<Setter Property="Background" Value="{ThemeResource ExpanderHeaderBackground}" />
<Setter Property="MinWidth" Value="{ThemeResource FlyoutThemeMinWidth}" />
<Setter Property="MaxWidth" Value="1000" />
@@ -800,14 +800,15 @@
<Setter Property="BorderThickness" Value="{ThemeResource ExpanderHeaderBorderThickness}" />
<Setter Property="BorderBrush" Value="{ThemeResource ExpanderHeaderBorderBrush}" />
<Setter Property="Padding" Value="16,0,8,0" />
<Setter Property="Margin" Value="0,4,8,0" />
<Setter Property="Margin" Value="0,4,0,0" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
<Setter Property="VerticalAlignment" Value="Stretch" />
<Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ToggleButton">
<ControlTemplate TargetType="Button">
<Grid x:Name="Grid"
Padding="{TemplateBinding Padding}"
AutomationProperties.AccessibilityView="Raw"

2
src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp
View File

@@ -23,6 +23,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
Automation::AutomationProperties::SetFullDescription(StartingDirectoryUseParentCheckbox(), unbox_value<hstring>(startingDirCheckboxTooltip));
Automation::AutomationProperties::SetName(DeleteButton(), RS_(L"Profile_DeleteButton/Text"));
AppearanceNavigator().Content(box_value(RS_(L"Profile_Appearance/Header")));
AdvancedNavigator().Content(box_value(RS_(L"Profile_Advanced/Header")));
}
void Profiles_Base::OnNavigatedTo(const NavigationEventArgs& e)

21
src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
View File

@@ -146,19 +146,18 @@
Margin="0,48,0,0"
Style="{StaticResource SubtitleTextBlockStyle}" />
<ToggleButton Click="Appearance_Click"
Style="{StaticResource ToggleButtonStyle}">
<Button x:Name="AppearanceNavigator"
Click="Appearance_Click"
Style="{StaticResource NavigatorButtonStyle}">
Appearance
</Button>
<Button x:Name="AdvancedNavigator"
Click="Advanced_Click"
Style="{StaticResource NavigatorButtonStyle}">
<TextBlock HorizontalAlignment="Left"
VerticalAlignment="Center"
Text="Appearance" />
</ToggleButton>
<ToggleButton Click="Advanced_Click"
Style="{StaticResource ToggleButtonStyle}">
<ContentPresenter HorizontalAlignment="Left">
<TextBlock HorizontalAlignment="Left"
Text="Advanced" />
</ContentPresenter>
</ToggleButton>
Text="Advanced" />
</Button>
<!-- Delete Button -->
<Button x:Name="DeleteButton"
Margin="{StaticResource StandardControlMargin}"